#46: Hardcoding routing values temporarily to keep OpenAPI spec gener…

…ation deterministic
EinStack · Jan 14, 2024 · 4f317de · 4f317de
1 parent f64b718
commit 4f317de
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/docs/docs.go b/docs/docs.go
@@ -409,6 +409,11 @@ const docTemplate = `{
                 },
                 "strategy": {
                     "description": "strategy on picking the next model to serve the request",
+                    "enum": [
+                        "least_latency",
+                        "round_robin",
+                        "priority"
+                    ],
                     "allOf": [
                         {
                             "$ref": "#/definitions/routing.Strategy"
@@ -422,7 +427,7 @@ const docTemplate = `{
             "enum": [
                 "least_latency",
                 "priority",
-                "round-robin"
+                "round_robin"
             ],
             "x-enum-varnames": [
                 "LeastLatency",

diff --git a/docs/swagger.json b/docs/swagger.json
@@ -406,6 +406,11 @@
                 },
                 "strategy": {
                     "description": "strategy on picking the next model to serve the request",
+                    "enum": [
+                        "least_latency",
+                        "round_robin",
+                        "priority"
+                    ],
                     "allOf": [
                         {
                             "$ref": "#/definitions/routing.Strategy"
@@ -419,7 +424,7 @@
             "enum": [
                 "least_latency",
                 "priority",
-                "round-robin"
+                "round_robin"
             ],
             "x-enum-varnames": [
                 "LeastLatency",

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -193,6 +193,10 @@ definitions:
         allOf:
         - $ref: '#/definitions/routing.Strategy'
         description: strategy on picking the next model to serve the request
+        enum:
+        - least_latency
+        - round_robin
+        - priority
     required:
     - models
     - routers
@@ -201,7 +205,7 @@ definitions:
     enum:
     - least_latency
     - priority
-    - round-robin
+    - round_robin
     type: string
     x-enum-varnames:
     - LeastLatency

diff --git a/pkg/routers/config.go b/pkg/routers/config.go
@@ -47,11 +47,11 @@ func (c *Config) BuildLangRouters(tel *telemetry.Telemetry) ([]*LangRouter, erro
 // TODO: how to specify other backoff strategies?
 // LangRouterConfig
 type LangRouterConfig struct {
-	ID              string                      `yaml:"id" json:"routers" validate:"required"`    // Unique router ID
-	Enabled         bool                        `yaml:"enabled" json:"enabled"`                   // Is router enabled?
-	Retry           *retry.ExpRetryConfig       `yaml:"retry" json:"retry"`                       // retry when no healthy model is available to router
-	RoutingStrategy routing.Strategy            `yaml:"strategy" json:"strategy"`                 // strategy on picking the next model to serve the request
-	Models          []providers.LangModelConfig `yaml:"models" json:"models" validate:"required"` // the list of models that could handle requests
+	ID              string                      `yaml:"id" json:"routers" validate:"required"`                               // Unique router ID
+	Enabled         bool                        `yaml:"enabled" json:"enabled"`                                              // Is router enabled?
+	Retry           *retry.ExpRetryConfig       `yaml:"retry" json:"retry"`                                                  // retry when no healthy model is available to router
+	RoutingStrategy routing.Strategy            `yaml:"strategy" json:"strategy" enums:"least_latency,round_robin,priority"` // strategy on picking the next model to serve the request
+	Models          []providers.LangModelConfig `yaml:"models" json:"models" validate:"required"`                            // the list of models that could handle requests
 }
 
 // BuildModels creates LanguageModel slice out of the given config

diff --git a/pkg/routers/routing/round_robin.go b/pkg/routers/routing/round_robin.go
@@ -7,7 +7,7 @@ import (
 )
 
 const (
-	RoundRobin Strategy = "round-robin"
+	RoundRobin Strategy = "round_robin"
 )
 
 // RoundRobinRouting routes request to the next model in the list in cycle
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ import ( @@
     )
     const (
-    	RoundRobin Strategy = "round-robin"
+    	RoundRobin Strategy = "round_robin"
     )
     // RoundRobinRouting routes request to the next model in the list in cycle
@@ Expand Down @@