Update config_provider.py

config_provider.py

@@ -5,11 +5,11 @@ Flare – ConfigProvider (date type support)
 from __future__ import annotations
 import json, os
 from pathlib import Path
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Union
 import commentjson
 
 from utils import log
-from pydantic import BaseModel, Field, HttpUrl, ValidationError
+from pydantic import BaseModel, Field, HttpUrl, ValidationError, field_validator
 from encryption_utils import decrypt
 
 class GlobalConfig(BaseModel):
@@ -70,9 +70,20 @@ class APIAuthConfig(BaseModel):
     enabled: bool = False
     token_endpoint: Optional[HttpUrl] = None
     response_token_path: str = "access_token"
-    token_request_body: str = "{}"  # JSON string
+    token_request_body: Dict[str, Any] = Field({}, alias="body_template")
     token_refresh_endpoint: Optional[HttpUrl] = None
-    token_refresh_body: str = "{}"  # JSON string
+    token_refresh_body: Dict[str, Any] = {}
+
+    @field_validator('token_request_body', 'token_refresh_body', mode='before')
+    def parse_json_strings(cls, v):
+        """Parse JSON strings to dict"""
+        if isinstance(v, str):
+            try:
+                return json.loads(v)
+            except json.JSONDecodeError:
+                log(f"⚠️ Invalid JSON string in auth config: {v}")
+                return {}
+        return v
 
     class Config:
         extra = "allow"
@@ -89,14 +100,32 @@ class APIConfig(BaseModel):
     name: str
     url: HttpUrl
     method: str = Field("GET", pattern=r"^(GET|POST|PUT|PATCH|DELETE)$")
-    headers: str = "{}"  # JSON string
-    body_template: str = "{}"  # JSON string
+    headers: Dict[str, Any] = {}
+    body_template: Dict[str, Any] = {}
     timeout_seconds: int = 10
     retry: RetryConfig = RetryConfig()
-    proxy: Optional[str | ProxyConfig] = None
+    proxy: Optional[Union[str, ProxyConfig]] = None
     auth: Optional[APIAuthConfig] = None
     response_prompt: Optional[str] = None
-    response_mappings: List[ResponseMappingConfig] = []
+    response_mappings: List[ResponseMappingConfig] = []  # Yeni alan
+    
+    # Audit fields
+    last_update_date: Optional[str] = None
+    last_update_user: Optional[str] = None
+    created_date: Optional[str] = None
+    created_by: Optional[str] = None
+    deleted: bool = False
+
+    @field_validator('headers', 'body_template', mode='before')
+    def parse_json_strings(cls, v):
+        """Parse JSON strings to dict"""
+        if isinstance(v, str):
+            try:
+                return json.loads(v)
+            except json.JSONDecodeError:
+                log(f"⚠️ Invalid JSON string in API config: {v}")
+                return {}
+        return v
 
     class Config:
         extra = "allow"
@@ -147,12 +176,22 @@ class LLMConfig(BaseModel):
 
 
 class VersionConfig(BaseModel):
-    id: int = Field(..., alias="version_number")
+    id: int
+    version_number: int
     caption: Optional[str] = ""
     published: bool = False
     general_prompt: str
-    llm: "LLMConfig"
-    intents: List["IntentConfig"]
+    llm: LLMConfig
+    intents: List[IntentConfig]
+    
+    # Audit fields
+    last_update_date: Optional[str] = None
+    last_update_user: Optional[str] = None
+    created_date: Optional[str] = None
+    created_by: Optional[str] = None
+    deleted: bool = False
+    publish_date: Optional[str] = None
+    published_by: Optional[str] = None
 
     class Config:
         extra = "allow"
@@ -170,7 +209,7 @@ class ProjectConfig(BaseModel):
     supported_languages: List[str] = Field(default_factory=lambda: ["tr"])
     timezone: str = "Europe/Istanbul" 
     region: str = "tr-TR"
-    last_version_number: Optional[int] = None
+    version_id_counter: int = 1
     versions: List[VersionConfig]
     
     # Audit fields
@@ -184,11 +223,29 @@ class ProjectConfig(BaseModel):
         extra = "allow"
 
 
+# ---------------- Activity Log -----------
+class ActivityLogEntry(BaseModel):
+    id: int
+    timestamp: str
+    user: str
+    action: str
+    entity_type: str
+    entity_id: Optional[int] = None
+    entity_name: Optional[str] = None
+    details: Optional[str] = None
+
+
 # ---------------- Service Config ---------
 class ServiceConfig(BaseModel):
     global_config: GlobalConfig = Field(..., alias="config")
     projects: List[ProjectConfig]
     apis: List[APIConfig]
+    activity_log: List[ActivityLogEntry] = []
+    
+    # Config level fields
+    project_id_counter: int = 1
+    last_update_date: Optional[str] = None
+    last_update_user: Optional[str] = None
 
     # runtime helpers (skip validation)
     _api_by_name: Dict[str, APIConfig] = {}
@@ -196,8 +253,39 @@ class ServiceConfig(BaseModel):
     def build_index(self):
         self._api_by_name = {a.name: a for a in self.apis}
 
-    def get_api(self, name: str) -> APIConfig | None:
+    def get_api(self, name: str) -> Optional[APIConfig]:
         return self._api_by_name.get(name)
+    
+    def to_jsonc_dict(self) -> dict:
+        """Convert to dict for saving to JSONC file"""
+        data = self.model_dump(by_alias=True, exclude={'_api_by_name'})
+        
+        # Convert API configs
+        for api in data.get('apis', []):
+            # Convert headers and body_template to JSON strings
+            if 'headers' in api and isinstance(api['headers'], dict):
+                api['headers'] = json.dumps(api['headers'], ensure_ascii=False)
+            if 'body_template' in api and isinstance(api['body_template'], dict):
+                api['body_template'] = json.dumps(api['body_template'], ensure_ascii=False)
+            
+            # Convert auth configs
+            if 'auth' in api and api['auth']:
+                if 'token_request_body' in api['auth'] and isinstance(api['auth']['token_request_body'], dict):
+                    api['auth']['token_request_body'] = json.dumps(api['auth']['token_request_body'], ensure_ascii=False)
+                if 'token_refresh_body' in api['auth'] and isinstance(api['auth']['token_refresh_body'], dict):
+                    api['auth']['token_refresh_body'] = json.dumps(api['auth']['token_refresh_body'], ensure_ascii=False)
+        
+        return data
+    
+    def save(self):
+        """Save configuration to file"""
+        config_path = Path(__file__).parent / "service_config.jsonc"
+        data = self.to_jsonc_dict()
+        
+        with open(config_path, 'w', encoding='utf-8') as f:
+            json.dump(data, f, ensure_ascii=False, indent=2)
+        
+        log("✅ Configuration saved to service_config.jsonc")
 
 
 # ---------------- Provider Singleton -----
@@ -275,4 +363,10 @@ class ConfigProvider:
                 log("✅ Running in on-premise mode with .env file")
             else:
                 log("⚠️ Running in on-premise mode but .env file not found")
-                log("📌 Copy .env.example to .env and configure it")
+                log("📌 Copy .env.example to .env and configure it")
+    
+    @classmethod
+    def save(cls):
+        """Save current configuration to file"""
+        if cls._instance:
+            cls._instance.save()