Update config_provider.py

config_provider.py

@@ -1,11 +1,12 @@
 """
-Flare – ConfigProvider (şifreli cloud_token desteği)
+Flare – ConfigProvider (model field düzeltmeleri)
 """
 
 from __future__ import annotations
 import json, os
 from pathlib import Path
 from typing import Any, Dict, List, Optional
+import commentjson
 
 from pydantic import BaseModel, Field, HttpUrl, ValidationError
 from utils import log
@@ -50,6 +51,7 @@ class APIAuthConfig(BaseModel):
 
     class Config:
         extra = "allow"
+        populate_by_name = True
 
 
 class APIConfig(BaseModel):
@@ -66,6 +68,7 @@ class APIConfig(BaseModel):
 
     class Config:
         extra = "allow"
+        populate_by_name = True
 
 
 # ---------------- Intent / Param ---------
@@ -74,6 +77,7 @@ class ParameterConfig(BaseModel):
     caption: Optional[str] = ""
     type: str = Field(..., pattern=r"^(int|float|bool|str|string)$")
     required: bool = True
+    variable_name: str  # Add this field
     extraction_prompt: Optional[str] = None
     validation_regex: Optional[str] = None
     invalid_prompt: Optional[str] = None
@@ -165,48 +169,12 @@ class ConfigProvider:
     def _load(cls) -> ServiceConfig:
         log(f"📥 Loading service config from {cls._CONFIG_PATH.name} …")
         raw = cls._CONFIG_PATH.read_text(encoding="utf-8")
-        json_str = cls._strip_jsonc(raw)
+        # Use commentjson instead of custom parser
         try:
-            data = json.loads(json_str)
+            data = commentjson.loads(raw)
             cfg = ServiceConfig.model_validate(data)
             log("✅ Service config loaded.")
             return cfg
-        except (json.JSONDecodeError, ValidationError) as exc:
+        except (commentjson.JSONLibraryException, ValidationError) as exc:
             log(f"❌ Config validation error: {exc}")
-            raise
-
-    @staticmethod
-    def _strip_jsonc(text: str) -> str:
-        """Remove // and /* */ comments (string-aware)."""
-        OUT, STR, ESC, SLASH, BLOCK = 0, 1, 2, 3, 4
-        state, res, i = OUT, [], 0
-        while i < len(text):
-            ch = text[i]
-            if state == OUT:
-                if ch == '"':
-                    state, res = STR, res + [ch]
-                elif ch == '/':
-                    nxt = text[i + 1] if i + 1 < len(text) else ""
-                    if nxt == '/':
-                        state, i = SLASH, i + 1
-                    elif nxt == '*':
-                        state, i = BLOCK, i + 1
-                    else:
-                        res.append(ch)
-                else:
-                    res.append(ch)
-            elif state == STR:
-                res.append(ch)
-                state = ESC if ch == '\\' else (OUT if ch == '"' else STR)
-            elif state == ESC:
-                res.append(ch)
-                state = STR
-            elif state == SLASH:
-                if ch == '\n':
-                    res.append(ch)
-                    state = OUT
-            elif state == BLOCK:
-                if ch == '*' and i + 1 < len(text) and text[i + 1] == '/':
-                    i, state = i + 1, OUT
-            i += 1
-        return ''.join(res)
+            raise