Update config_provider.py

config_provider.py

@@ -1,130 +1,125 @@
 """
-Flare – Configuration Loader
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-• JSONC (comment-json) desteği
-• Pydantic şema + runtime validation
-• Global erişim için singleton ConfigProvider.get()
+Flare – ConfigProvider
+~~~~~~~~~~~~~~~~~~~~~~
+• service_config.jsonc dosyasını tek sefer parse eder, nesnelere map eder
+• Pydantic v2 kullanımı (Field(..., pattern=…))
 """
 
-import pathlib
-from functools import lru_cache
-from typing import Dict, List, Optional
-
-import commentjson as jsonc
-from pydantic import BaseModel, Field, validator
+from __future__ import annotations
 
-CONFIG_PATH = pathlib.Path(__file__).parent / "service_config.jsonc"
+import json
+import re
+from pathlib import Path
+from typing import Dict, List, Optional
 
+from pydantic import BaseModel, Field, HttpUrl, ValidationError
+from utils import log
 
-# === Pydantic Schemas =======================================================
+# -------------------- Model tanımları --------------------
 class RetryConfig(BaseModel):
-    max_attempts: int = 3
+    strategy: str = Field(  # static | exponential
+        "static", pattern=r"^(static|exponential)$"
+    )
+    retry_count: int = 3
     backoff_seconds: int = 2
-    strategy: str = Field("static", regex="^(static|exponential)$")
-
-
-class ProxyConfig(BaseModel):
-    enabled: bool = False
-    url: Optional[str] = None
-
-
-class AuthConfig(BaseModel):
-    enabled: bool = False
-    token_endpoint: Optional[str] = None
-    body_template: Dict[str, str] = {}
-    response_token_path: Optional[str] = None
-    token_refresh_endpoint: Optional[str] = None
-    token_refresh_body: Dict[str, str] = {}
-
-    @validator("token_endpoint", always=True)
-    def _require_endpoint(cls, v, values):
-        if values["enabled"] and not v:
-            raise ValueError("Auth enabled but token_endpoint missing")
-        return v
-
-
-class APIConfig(BaseModel):
-    url: str
-    method: str = Field("POST", regex="^(GET|POST|PUT|DELETE|PATCH)$")
-    headers: Dict[str, str] = {}
-    body_template: Dict[str, str] = {}
-    timeout_seconds: int = 10
-    retry: RetryConfig = RetryConfig()
-    auth: AuthConfig = AuthConfig()
-    proxy: ProxyConfig = ProxyConfig()
-    response_prompt: str
 
 
 class ParameterConfig(BaseModel):
     name: str
-    type: str
+    type: str = Field(..., pattern=r"^(int|float|str|bool)$")
     required: bool = True
-    extraction_prompt: str
-    validation_regex: Optional[str] = None
     invalid_prompt: Optional[str] = None
-    type_error_prompt: Optional[str] = None
 
 
 class IntentConfig(BaseModel):
     name: str
-    caption: Optional[str]
-    locale: str = "tr-TR"
-    dependencies: List[str] = []
-    examples: List[str]
-    detection_prompt: str
-    parameters: List[ParameterConfig] = []
     action: str
-    fallback_timeout_prompt: Optional[str] = None
+    parameters: List[ParameterConfig] = []
     fallback_error_prompt: Optional[str] = None
 
 
-class LLMConfig(BaseModel):
-    repo_id: str
-    generation_config: Dict[str, float]
-    use_fine_tune: bool = False
-    fine_tune_zip: Optional[str] = None
-
-
 class VersionConfig(BaseModel):
-    version_number: int
-    published: bool
+    id: int
+    caption: str
     general_prompt: str
-    llm: LLMConfig
-    intents: List[IntentConfig]
+    is_published: bool = Field(False, alias="published")
+    intents: List[IntentConfig] = []
 
 
 class ProjectConfig(BaseModel):
     name: str
-    enabled: bool = True
-    last_version_number: int
+    caption: str
     versions: List[VersionConfig]
 
 
-class UserConfig(BaseModel):
-    username: str
-    password_hash: str
-    salt: str
+class APIAuthConfig(BaseModel):
+    token_endpoint: HttpUrl
+    refresh_endpoint: Optional[HttpUrl] = None
+    client_id: str
+    client_secret: str
 
 
-class GlobalConfig(BaseModel):
-    work_mode: str = Field(..., regex="^(hfcloud|cloud|on-premise)$")
-    cloud_token: Optional[str]
-    spark_endpoint: str
-    users: List[UserConfig]
+class APIConfig(BaseModel):
+    name: str
+    url: HttpUrl
+    method: str = Field("GET", pattern=r"^(GET|POST|PUT|PATCH|DELETE)$")
+    timeout_seconds: int = 10
+    proxy: Optional[str] = None
+    auth: Optional[APIAuthConfig] = None
+    response_prompt: Optional[str] = None
+    retry: Optional[RetryConfig] = None
 
 
-class RootConfig(BaseModel):
-    config: GlobalConfig
+class ServiceConfig(BaseModel):
     projects: List[ProjectConfig]
     apis: Dict[str, APIConfig]
+    locale: str = "tr-TR"
+    retry: RetryConfig = RetryConfig()
 
 
-# === Singleton Loader =======================================================
+# -------------------- Provider singleton ----------------
 class ConfigProvider:
+    """service_config.jsonc okur, tekil instance döndürür."""
+
+    _config: Optional[ServiceConfig] = None
+    _CONFIG_PATH = Path(__file__).parent / "service_config.jsonc"
+
+    @classmethod
+    def get(cls) -> ServiceConfig:
+        if cls._config is None:
+            cls._config = cls._load_config()
+        return cls._config
+
+    # ---------------- internal ----------------
+    @classmethod
+    def _load_config(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)
+        try:
+            data = json.loads(json_str)
+            cfg = ServiceConfig.model_validate(data)
+            log("✅ Service config loaded successfully.")
+            return cfg
+        except (json.JSONDecodeError, ValidationError) as exc:
+            log(f"❌ Config validation error: {exc}")
+            raise
+
     @staticmethod
-    @lru_cache
-    def get(path: str = None) -> RootConfig:
-        cfg_file = pathlib.Path(path) if path else CONFIG_PATH
-        with cfg_file.open("r", encoding="utf-8") as f:
-            data = jsonc.load(f)
-        return RootConfig.parse_obj(data)
+    def _strip_jsonc(content: str) -> str:
+        """Remove // and /* */ comments for JSONC."""
+        # Remove // … lines
+        content = re.sub(r"//.*", "", content)
+        # Remove /* … */ blocks
+        content = re.sub(r"/\*.*?\*/", "", content, flags=re.S)
+        return content
+
+
+# --------------- Convenience aliases for imports ---------------
+RetryConfig = RetryConfig
+ParameterConfig = ParameterConfig
+IntentConfig = IntentConfig
+VersionConfig = VersionConfig
+APIConfig = APIConfig
+ProjectConfig = ProjectConfig
+ServiceConfig = ServiceConfig