Update config_provider.py

config_provider.py

@@ -3,14 +3,14 @@ Flare – ConfigProvider (with Provider Abstraction and Multi-language Support)
 """
 
 from __future__ import annotations
-import json, os, threading
+import json, os
+import threading
 from pathlib import Path
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Union
 from datetime import datetime
 import commentjson
-
-from pydantic import BaseModel, Field, HttpUrl, ValidationError
 from utils import log
+from pydantic import BaseModel, Field, HttpUrl, ValidationError, field_validator, validator
 from encryption_utils import decrypt
 
 # ===================== New Provider Classes =====================
@@ -41,12 +41,47 @@ class LocalizedExample(BaseModel):
     locale_code: str
     example: str
 
+# ---------------- Parameter Collection Config ---------
+class ParameterCollectionConfig(BaseModel):
+    """Configuration for smart parameter collection"""
+    max_params_per_question: int = Field(default=2, ge=1, le=5)
+    smart_grouping: bool = Field(default=True)
+    retry_unanswered: bool = Field(default=True)
+    collection_prompt: str = Field(default="""
+You are a helpful assistant collecting information from the user.
+
+Conversation context:
+{{conversation_history}}
+
+Intent: {{intent_name}} - {{intent_caption}}
+
+Already collected:
+{{collected_params}}
+
+Still needed:
+{{missing_params}}
+
+Previously asked but not answered:
+{{unanswered_params}}
+
+Rules:
+1. Ask for maximum {{max_params}} parameters in one question
+2. Group parameters that naturally go together (like from/to cities, dates)
+3. If some parameters were asked before but not answered, include them again
+4. Be natural and conversational in {{project_language}}
+5. Use context from the conversation to make the question flow naturally
+
+Generate ONLY the question, nothing else.""")
+
+    class Config:
+        extra = "allow"
+
 # ===================== Global Configuration =====================
 class GlobalConfig(BaseModel):
     # Provider settings (replaces work_mode, cloud_token, spark_endpoint)
     llm_provider: ProviderSettings
-    tts_provider: ProviderSettings = ProviderSettings(name="no_tts")
-    stt_provider: ProviderSettings = ProviderSettings(name="no_stt")
+    tts_provider: ProviderSettings = Field(default_factory=lambda: ProviderSettings(name="no_tts"))
+    stt_provider: ProviderSettings = Field(default_factory=lambda: ProviderSettings(name="no_stt"))
     
     # Available providers
     providers: List[ProviderConfig] = []
@@ -75,7 +110,9 @@ class GlobalConfig(BaseModel):
         }
         provider = provider_map.get(provider_type)
         if provider and provider.api_key:
-            return decrypt(provider.api_key) if provider.api_key else None
+            if provider.api_key.startswith("enc:"):
+                return decrypt(provider.api_key)
+            return provider.api_key
         return None
     
     # Backward compatibility helpers
@@ -85,14 +122,23 @@ class GlobalConfig(BaseModel):
     
     def is_gpt_mode(self) -> bool:
         """Check if using GPT provider"""
-        return self.llm_provider.name.startswith("gpt4o")
+        return self.llm_provider.name.startswith("gpt4o") if self.llm_provider else False
+    
+    def get_gpt_model(self) -> str:
+        """Get the GPT model name for OpenAI API"""
+        if self.llm_provider.name == "gpt4o":
+            return "gpt-4o"
+        elif self.llm_provider.name == "gpt4o-mini":
+            return "gpt-4o-mini"
+        return None
 
-# ===================== Other Config Classes =====================
+# ---------------- Global -----------------
 class UserConfig(BaseModel):
     username: str
     password_hash: str
     salt: str
 
+# ---------------- Retry / Proxy ----------
 class RetryConfig(BaseModel):
     retry_count: int = Field(3, alias="max_attempts")
     backoff_seconds: int = 2
@@ -102,6 +148,7 @@ class ProxyConfig(BaseModel):
     enabled: bool = True
     url: HttpUrl
 
+# ---------------- API & Auth -------------
 class APIAuthConfig(BaseModel):
     enabled: bool = False
     token_endpoint: Optional[HttpUrl] = None
@@ -122,7 +169,7 @@ class APIConfig(BaseModel):
     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[Dict[str, Any]] = []
@@ -136,7 +183,7 @@ class APIConfig(BaseModel):
         extra = "allow"
         populate_by_name = True
 
-# ===================== Intent / Parameter =====================
+# ---------------- Intent / Param ---------
 class ParameterConfig(BaseModel):
     name: str
     caption: List[LocalizedCaption] = []  # Multi-language captions
@@ -207,7 +254,7 @@ class IntentConfig(BaseModel):
         # Return all examples if no locale match
         return [e.example for e in self.examples]
 
-# ===================== Version / Project =====================
+# ---------------- Version / Project ------
 class LLMConfig(BaseModel):
     repo_id: str
     generation_config: Dict[str, Any] = {}
@@ -259,7 +306,7 @@ class ProjectConfig(BaseModel):
     class Config:
         extra = "allow"
 
-# ===================== Activity Log =====================
+# ---------------- Activity Log -----------
 class ActivityLogEntry(BaseModel):
     timestamp: str
     username: str
@@ -269,7 +316,7 @@ class ActivityLogEntry(BaseModel):
     entity_name: Optional[str] = None
     details: Optional[str] = None
 
-# ===================== Service Config =====================
+# ---------------- Service Config ---------
 class ServiceConfig(BaseModel):
     global_config: GlobalConfig = Field(..., alias="config")
     projects: List[ProjectConfig]
@@ -285,7 +332,7 @@ class ServiceConfig(BaseModel):
     _api_by_name: Dict[str, APIConfig] = {}
 
     def build_index(self):
-        self._api_by_name = {a.name: a for a in self.apis}
+        self._api_by_name = {a.name: a for a in self.apis if not a.deleted}
 
     def get_api(self, name: str) -> Optional[APIConfig]:
         return self._api_by_name.get(name)
@@ -325,7 +372,7 @@ class ServiceConfig(BaseModel):
         
         log("✅ Configuration saved to service_config.jsonc")
 
-# ===================== Provider Singleton =====================
+# ---------------- Provider Singleton -----
 class ConfigProvider:
     _instance: Optional[ServiceConfig] = None
     _CONFIG_PATH = Path(__file__).parent / "service_config.jsonc"
@@ -371,6 +418,10 @@ class ConfigProvider:
             if 'config' not in config_data:
                 config_data['config'] = {}
             
+            # Handle backward compatibility - convert old format to new
+            if 'work_mode' in config_data.get('config', {}):
+                cls._migrate_old_config(config_data)
+            
             # Parse API configs specially
             if 'apis' in config_data:
                 for api in config_data['apis']:
@@ -404,6 +455,163 @@ class ConfigProvider:
             log(f"❌ Error loading config: {e}")
             raise
     
+    @classmethod
+    def _migrate_old_config(cls, config_data: dict):
+        """Migrate old config format to new provider-based format"""
+        log("🔄 Migrating old config format to new provider format...")
+        
+        old_config = config_data.get('config', {})
+        
+        # Create default providers if not exists
+        if 'providers' not in old_config:
+            old_config['providers'] = [
+                {
+                    "type": "llm",
+                    "name": "spark",
+                    "display_name": "Spark (HuggingFace)",
+                    "requires_endpoint": True,
+                    "requires_api_key": True,
+                    "requires_repo_info": True
+                },
+                {
+                    "type": "llm",
+                    "name": "gpt4o",
+                    "display_name": "GPT-4o",
+                    "requires_endpoint": False,
+                    "requires_api_key": True,
+                    "requires_repo_info": False
+                },
+                {
+                    "type": "llm",
+                    "name": "gpt4o-mini",
+                    "display_name": "GPT-4o Mini",
+                    "requires_endpoint": False,
+                    "requires_api_key": True,
+                    "requires_repo_info": False
+                },
+                {
+                    "type": "tts",
+                    "name": "elevenlabs",
+                    "display_name": "ElevenLabs",
+                    "requires_endpoint": False,
+                    "requires_api_key": True
+                },
+                {
+                    "type": "stt",
+                    "name": "google",
+                    "display_name": "Google Speech-to-Text",
+                    "requires_endpoint": False,
+                    "requires_api_key": True
+                }
+            ]
+        
+        # Migrate LLM provider
+        work_mode = old_config.get('work_mode', 'hfcloud')
+        if work_mode in ['gpt4o', 'gpt4o-mini']:
+            provider_name = work_mode
+            api_key = old_config.get('cloud_token', '')
+            endpoint = None
+        else:
+            provider_name = 'spark'
+            api_key = old_config.get('cloud_token', '')
+            endpoint = old_config.get('spark_endpoint', '')
+        
+        old_config['llm_provider'] = {
+            "name": provider_name,
+            "api_key": api_key,
+            "endpoint": endpoint,
+            "settings": {
+                "internal_prompt": old_config.get('internal_prompt', ''),
+                "parameter_collection_config": old_config.get('parameter_collection_config', {
+                    "max_params_per_question": 2,
+                    "smart_grouping": True,
+                    "retry_unanswered": True,
+                    "collection_prompt": ParameterCollectionConfig().collection_prompt
+                })
+            }
+        }
+        
+        # Migrate TTS provider
+        tts_engine = old_config.get('tts_engine', 'no_tts')
+        old_config['tts_provider'] = {
+            "name": tts_engine,
+            "api_key": old_config.get('tts_engine_api_key', ''),
+            "settings": old_config.get('tts_settings', {})
+        }
+        
+        # Migrate STT provider
+        stt_engine = old_config.get('stt_engine', 'no_stt')
+        old_config['stt_provider'] = {
+            "name": stt_engine,
+            "api_key": old_config.get('stt_engine_api_key', ''),
+            "settings": old_config.get('stt_settings', {})
+        }
+        
+        # Migrate projects - language settings
+        for project in config_data.get('projects', []):
+            if 'default_language' in project:
+                # Map language names to locale codes
+                lang_to_locale = {
+                    'Türkçe': 'tr',
+                    'Turkish': 'tr',
+                    'English': 'en',
+                    'Deutsch': 'de',
+                    'German': 'de'
+                }
+                project['default_locale'] = lang_to_locale.get(project['default_language'], 'tr')
+                del project['default_language']
+            
+            if 'supported_languages' in project:
+                # Convert to locale codes
+                supported_locales = []
+                for lang in project['supported_languages']:
+                    locale = lang_to_locale.get(lang, lang)
+                    if locale not in supported_locales:
+                        supported_locales.append(locale)
+                project['supported_locales'] = supported_locales
+                del project['supported_languages']
+            
+            # Migrate intent examples and parameter captions
+            for version in project.get('versions', []):
+                for intent in version.get('intents', []):
+                    # Migrate examples
+                    if 'examples' in intent and isinstance(intent['examples'], list):
+                        new_examples = []
+                        for example in intent['examples']:
+                            if isinstance(example, str):
+                                # Old format - use project default locale
+                                new_examples.append({
+                                    "locale_code": project.get('default_locale', 'tr'),
+                                    "example": example
+                                })
+                            elif isinstance(example, dict) and 'locale_code' in example:
+                                # Already new format
+                                new_examples.append(example)
+                        intent['examples'] = new_examples
+                    
+                    # Migrate parameter captions
+                    for param in intent.get('parameters', []):
+                        if 'caption' in param:
+                            if isinstance(param['caption'], str):
+                                # Old format - convert to multi-language
+                                param['caption'] = [{
+                                    "locale_code": project.get('default_locale', 'tr'),
+                                    "caption": param['caption']
+                                }]
+                            elif isinstance(param['caption'], list) and param['caption'] and isinstance(param['caption'][0], dict):
+                                # Already new format
+                                pass
+        
+        # Remove old fields
+        fields_to_remove = ['work_mode', 'cloud_token', 'spark_endpoint', 'internal_prompt',
+                           'tts_engine', 'tts_engine_api_key', 'tts_settings',
+                           'stt_engine', 'stt_engine_api_key', 'stt_settings',
+                           'parameter_collection_config']
+        for field in fields_to_remove:
+            old_config.pop(field, None)
+        
+        log("✅ Config migration completed")
+    
     @classmethod
     def _check_environment_setup(cls):
         """Check if environment is properly configured"""