Update config_provider.py

config_provider.py

@@ -1,5 +1,5 @@
 """
-Flare – ConfigProvider (date type support)
+Flare – ConfigProvider (TTS/STT support)
 """
 
 from __future__ import annotations
@@ -26,7 +26,7 @@ class GlobalConfig(BaseModel):
     })
 
     # STT configurations
-    stt_engine: str = Field("no_stt", pattern=r"^(no_stt|google|azure|amazon|gpt4o_realtime)$")
+    stt_engine: str = Field("no_stt", pattern=r"^(no_stt|google|azure|amazon|gpt4o_realtime|flicker)$")
     stt_engine_api_key: Optional[str] = None
     stt_settings: Optional[Dict[str, Any]] = Field(default_factory=lambda: {
         "speech_timeout_ms": 2000,
@@ -141,28 +141,11 @@ class APIAuthConfig(BaseModel):
     token_refresh_endpoint: Optional[HttpUrl] = None
     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"
         populate_by_name = True
 
 
-class ResponseMappingConfig(BaseModel):
-    """Response mapping configuration"""
-    variable_name: str = Field(..., pattern=r"^[a-z_][a-z0-9_]*$")
-    type: str = Field(..., pattern=r"^(int|float|bool|str|date)$")
-    json_path: str
-
 class APIConfig(BaseModel):
     name: str
     url: HttpUrl
@@ -171,33 +154,15 @@ class APIConfig(BaseModel):
     body_template: Dict[str, Any] = {}
     timeout_seconds: int = 10
     retry: RetryConfig = RetryConfig()
-    proxy: Optional[Union[str, ProxyConfig]] = None
+    proxy: Optional[str | ProxyConfig] = None
     auth: Optional[APIAuthConfig] = None
     response_prompt: Optional[str] = None
-    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"
         populate_by_name = True
 
+
 # ---------------- Intent / Param ---------
 class ParameterConfig(BaseModel):
     name: str
@@ -243,22 +208,12 @@ class LLMConfig(BaseModel):
 
 
 class VersionConfig(BaseModel):
-    id: int
-    version_number: int
+    id: int = Field(..., alias="version_number")
     caption: Optional[str] = ""
     published: bool = False
     general_prompt: str
-    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
+    llm: "LLMConfig"
+    intents: List["IntentConfig"]
 
     class Config:
         extra = "allow"
@@ -269,22 +224,9 @@ class ProjectConfig(BaseModel):
     id: Optional[int] = None
     name: str
     caption: Optional[str] = ""
-    icon: Optional[str] = "folder" 
-    description: Optional[str] = ""
     enabled: bool = True
-    default_language: str = "Turkish"
-    supported_languages: List[str] = Field(default_factory=lambda: ["tr"])
-    timezone: str = "Europe/Istanbul" 
-    region: str = "tr-TR"
-    version_id_counter: int = 1
+    last_version_number: Optional[int] = None
     versions: List[VersionConfig]
-    
-    # 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
 
     class Config:
         extra = "allow"
@@ -292,9 +234,8 @@ class ProjectConfig(BaseModel):
 
 # ---------------- Activity Log -----------
 class ActivityLogEntry(BaseModel):
-    id: int
     timestamp: str
-    user: str
+    username: str
     action: str
     entity_type: str
     entity_id: Optional[int] = None
@@ -368,6 +309,27 @@ class ConfigProvider:
             cls._check_environment_setup()
         return cls._instance
 
+    @classmethod
+    def reload(cls) -> ServiceConfig:
+        """Force reload configuration from file"""
+        cls._instance = None
+        return cls.get()
+    
+    @classmethod
+    def update_config(cls, config_dict: dict):
+        """Update the current configuration with new values"""
+        if cls._instance is None:
+            cls.get()
+        
+        # Update global config
+        if 'config' in config_dict:
+            for key, value in config_dict['config'].items():
+                if hasattr(cls._instance.global_config, key):
+                    setattr(cls._instance.global_config, key, value)
+        
+        # Save to file
+        cls._instance.save()
+
     @classmethod
     def _load(cls) -> ServiceConfig:
         """Load configuration from service_config.jsonc"""
@@ -380,6 +342,62 @@ class ConfigProvider:
             with open(cls._CONFIG_PATH, 'r', encoding='utf-8') as f:
                 config_data = commentjson.load(f)
             
+            # Ensure required fields exist in config data
+            if 'config' not in config_data:
+                config_data['config'] = {}
+            
+            config_section = config_data['config']
+            
+            # Set defaults for missing fields
+            config_section.setdefault('work_mode', 'hfcloud')
+            config_section.setdefault('spark_endpoint', 'http://localhost:7861')
+            config_section.setdefault('cloud_token', None)
+            config_section.setdefault('internal_prompt', None)
+            config_section.setdefault('tts_engine', 'no_tts')
+            config_section.setdefault('tts_engine_api_key', None)
+            config_section.setdefault('tts_settings', {'use_ssml': False})
+            config_section.setdefault('stt_engine', 'no_stt')
+            config_section.setdefault('stt_engine_api_key', None)
+            config_section.setdefault('stt_settings', {
+                'speech_timeout_ms': 2000,
+                'noise_reduction_level': 2,
+                'vad_sensitivity': 0.5,
+                'language': 'tr-TR',
+                'model': 'latest_long',
+                'use_enhanced': True,
+                'enable_punctuation': True,
+                'interim_results': True
+            })
+            config_section.setdefault('users', [])
+            
+            # Convert string body/headers to dict if needed
+            for api in config_data.get('apis', []):
+                if isinstance(api.get('headers'), str):
+                    try:
+                        api['headers'] = json.loads(api['headers'])
+                    except:
+                        api['headers'] = {}
+                
+                if isinstance(api.get('body_template'), str):
+                    try:
+                        api['body_template'] = json.loads(api['body_template'])
+                    except:
+                        api['body_template'] = {}
+                
+                # Handle auth section
+                if api.get('auth'):
+                    auth = api['auth']
+                    if isinstance(auth.get('token_request_body'), str):
+                        try:
+                            auth['token_request_body'] = json.loads(auth['token_request_body'])
+                        except:
+                            auth['token_request_body'] = {}
+                    if isinstance(auth.get('token_refresh_body'), str):
+                        try:
+                            auth['token_refresh_body'] = json.loads(auth['token_refresh_body'])
+                        except:
+                            auth['token_refresh_body'] = {}
+            
             # Create ServiceConfig instance
             service_config = ServiceConfig(**config_data)
             
@@ -417,23 +435,26 @@ class ConfigProvider:
             
             if missing_secrets:
                 log(f"⚠️ Running in {config.work_mode} mode. Missing secrets: {', '.join(missing_secrets)}")
-                log("📌 Add these in HuggingFace Space Settings → Repository secrets")
-            else:
-                log(f"✅ Running in {config.work_mode} mode with all required secrets")
-                
-        elif config.is_on_premise():
+                log("Please set these as HuggingFace Space Secrets for cloud deployment.")
+        else:
             # On-premise mode - check for .env file
-            env_path = Path(".env")
-            if env_path.exists():
-                from dotenv import load_dotenv
-                load_dotenv()
-                log("✅ Running in on-premise mode with .env file")
-            else:
+            env_path = Path(__file__).parent / ".env"
+            if not env_path.exists():
                 log("⚠️ Running in on-premise mode but .env file not found")
-                log("📌 Copy .env.example to .env and configure it")
-    
-    @classmethod
-    def save(cls):
-        """Save current configuration to file"""
-        if cls._instance:
-            cls._instance.save()
+                log("Creating default .env file...")
+                
+                default_env = """# Flare Environment Configuration
+JWT_SECRET=flare-admin-secret-key-change-in-production
+JWT_ALGORITHM=HS256
+JWT_EXPIRATION_HOURS=24
+FLARE_TOKEN_KEY=flare-token-encryption-key
+SPARK_TOKEN=your-spark-token-here
+"""
+                env_path.write_text(default_env)
+                log("✅ Default .env file created. Please update with your actual values.")
+
+
+# Forward references
+GlobalConfig.model_rebuild()
+VersionConfig.model_rebuild()
+ServiceConfig.model_rebuild()