Merged main into release while building v2.0.5

VERSION.txt

@@ -1 +1 @@
-v2.0.4
+v2.0.5

config/config.go

@@ -68,6 +68,15 @@ type ValidationConfig struct {
 	MaxExplanationLength  int
 }
 
+func GetEnvBool(key string, defaultValue bool) bool {
+	if value, exists := os.LookupEnv(key); exists {
+		if boolValue, err := strconv.ParseBool(value); err == nil {
+			return boolValue
+		}
+	}
+	return defaultValue
+}
+
 func getEnv(key, defaultValue string) string {
 	if value, exists := os.LookupEnv(key); exists {
 		return value

deploy/1.configmap.tmpl.yaml

@@ -16,7 +16,7 @@ data:
   LCG_CONFIG_FOLDER: "/app/data/config"  
   LCG_NO_HISTORY: "false"
   LCG_ALLOW_EXECUTION: "false"
-  LCG_DEBUG: "false"
+  LCG_DEBUG: "true"
 
   # Настройки аутентификации
   LCG_SERVER_REQUIRE_AUTH: "true"

deploy/3.deployment.tmpl.yaml

@@ -14,8 +14,7 @@ spec:
   template:
     metadata:
       labels:
-        app: lcg
-        version: ${VERSION}
+        app: lcg        
     spec:
       containers:
       - name: lcg

deploy/VERSION.txt

@@ -1 +1 @@
-v2.0.4
+v2.0.5

deploy/ingress-route.tmpl.yaml

@@ -4,8 +4,7 @@ metadata:
   name: lcg-route
   namespace: lcg
   labels:
-    app: lcg
-    version: ${VERSION}
+    app: lcg    
 spec:
   entryPoints:
   - websecure  

deploy/kustomization.tmpl.yaml

@@ -13,13 +13,13 @@ resources:
   - ingress-route.yaml  
 
 # Common labels
-commonLabels:
-  app: lcg
-  version: ${VERSION}
-  managed-by: kustomize
+# commonLabels:
+#   app: lcg
+#   version: ${VERSION}
+#   managed-by: kustomize
 
 # Images
-images:
-  - name: lcg
-    newName: ${REPOSITORY}
-    newTag: ${VERSION}
+# images:
+#   - name: lcg
+#     newName: ${REPOSITORY}
+#     newTag: ${VERSION}

deploy/service.tmpl.yaml

@@ -4,8 +4,7 @@ metadata:
   name: lcg
   namespace: lcg
   labels:
-    app: lcg
-    version: ${VERSION}
+    app: lcg    
 spec:
   type: ClusterIP
   ports:
@@ -14,5 +13,4 @@ spec:
     protocol: TCP
     name: http
   selector:
-    app: lcg
-    version: ${VERSION}
+    app: lcg    

gpt/providers.go

@@ -124,6 +124,11 @@ func (p *ProxyAPIProvider) Chat(messages []Chat) (string, error) {
 		req.Header.Set("Authorization", "Bearer "+p.JWTToken)
 	}
 
+	if config.AppConfig.MainFlags.Debug {
+		fmt.Println("Chat URL: ", p.BaseURL+config.AppConfig.Server.ProxyUrl)
+		fmt.Println("ProxyChatRequest: ", req)
+	}
+
 	resp, err := p.HTTPClient.Do(req)
 	if err != nil {
 		return "", fmt.Errorf("ошибка выполнения запроса: %w", err)

kustomize/configmap.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: lcg
 data:
   # Основные настройки
-  LCG_VERSION: "v2.0.4"
+  LCG_VERSION: "v2.0.5"
   LCG_BASE_PATH: "/lcg"
   LCG_SERVER_HOST: "0.0.0.0"
   LCG_SERVER_PORT: "8080"  
@@ -16,7 +16,7 @@ data:
   LCG_CONFIG_FOLDER: "/app/data/config"  
   LCG_NO_HISTORY: "false"
   LCG_ALLOW_EXECUTION: "false"
-  LCG_DEBUG: "false"
+  LCG_DEBUG: "true"
 
   # Настройки аутентификации
   LCG_SERVER_REQUIRE_AUTH: "true"

kustomize/deployment.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: lcg
   labels:
     app: lcg
-    version: v2.0.4
+    version: v2.0.5
 spec:
   replicas: 1
   selector:
@@ -14,12 +14,11 @@ spec:
   template:
     metadata:
       labels:
-        app: lcg
-        version: v2.0.4
+        app: lcg        
     spec:
       containers:
       - name: lcg
-        image: kuznetcovay/lcg:v2.0.4
+        image: kuznetcovay/lcg:v2.0.5
         imagePullPolicy: Always
         ports:
         - containerPort: 8080

kustomize/ingress-route.yaml

@@ -4,8 +4,7 @@ metadata:
   name: lcg-route
   namespace: lcg
   labels:
-    app: lcg
-    version: v2.0.4
+    app: lcg    
 spec:
   entryPoints:
   - websecure  

kustomize/kustomization.yaml

@@ -13,13 +13,13 @@ resources:
   - ingress-route.yaml  
 
 # Common labels
-commonLabels:
-  app: lcg
-  version: v2.0.4
-  managed-by: kustomize
+# commonLabels:
+#   app: lcg
+#   version: v2.0.5
+#   managed-by: kustomize
 
 # Images
-images:
-  - name: lcg
-    newName: kuznetcovay/lcg
-    newTag: v2.0.4
+# images:
+#   - name: lcg
+#     newName: kuznetcovay/lcg
+#     newTag: v2.0.5

kustomize/service.yaml

@@ -4,8 +4,7 @@ metadata:
   name: lcg
   namespace: lcg
   labels:
-    app: lcg
-    version: v2.0.4
+    app: lcg    
 spec:
   type: ClusterIP
   ports:
@@ -14,5 +13,4 @@ spec:
     protocol: TCP
     name: http
   selector:
-    app: lcg
-    version: v2.0.4
+    app: lcg    

main.go

@@ -156,6 +156,9 @@ lcg [опции] <описание команды>
 				Debug:     c.Bool("debug"),
 			}
 			disableHistory = config.AppConfig.MainFlags.NoHistory || config.AppConfig.IsNoHistoryEnabled()
+			
+			config.AppConfig.MainFlags.Debug = config.AppConfig.MainFlags.Debug || config.GetEnvBool("LCG_DEBUG", false)
+			
 			args := c.Args().Slice()
 
 			if len(args) == 0 {

serve/auth.go

@@ -94,7 +94,7 @@ func validateJWTToken(tokenString string) (*JWTClaims, error) {
 	}
 
 	// Парсим токен
-	token, err := jwt.ParseWithClaims(tokenString, &JWTClaims{}, func(token *jwt.Token) (interface{}, error) {
+	token, err := jwt.ParseWithClaims(tokenString, &JWTClaims{}, func(token *jwt.Token) (any, error) {
 		// Проверяем метод подписи
 		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
 			return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])