Update config_provider.py

config_provider.py

@@ -13,7 +13,7 @@ from utils import log
 from pydantic import BaseModel, Field, HttpUrl, ValidationError, field_validator, validator
 from encryption_utils import decrypt
 
-# ===================== New Provider Classes =====================
+# ===================== Models =====================
 class ProviderConfig(BaseModel):
     """Provider definition with requirements"""
     type: str = Field(..., pattern=r"^(llm|tts|stt)$")
@@ -41,104 +41,11 @@ 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 = Field(default_factory=lambda: ProviderSettings(name="no_tts"))
-    stt_provider: ProviderSettings = Field(default_factory=lambda: ProviderSettings(name="no_stt"))
-    
-    # Available providers
-    providers: List[ProviderConfig] = []
-    
-    # User management
-    users: List["UserConfig"] = []
-    
-    # Helper methods for providers
-    def get_provider_config(self, provider_type: str, provider_name: str) -> Optional[ProviderConfig]:
-        """Get provider configuration by type and name"""
-        return next(
-            (p for p in self.providers if p.type == provider_type and p.name == provider_name),
-            None
-        )
-    
-    def get_providers_by_type(self, provider_type: str) -> List[ProviderConfig]:
-        """Get all providers of a specific type"""
-        return [p for p in self.providers if p.type == provider_type]
-    
-    def get_plain_api_key(self, provider_type: str) -> Optional[str]:
-        """Get decrypted API key for a provider type"""
-        provider_map = {
-            "llm": self.llm_provider,
-            "tts": self.tts_provider,
-            "stt": self.stt_provider
-        }
-        provider = provider_map.get(provider_type)
-        if provider and provider.api_key:
-            if provider.api_key.startswith("enc:"):
-                return decrypt(provider.api_key)
-            return provider.api_key
-        return None
-    
-    # Backward compatibility helpers
-    def is_cloud_mode(self) -> bool:
-        """Check if running in cloud mode (HuggingFace)"""
-        return bool(os.environ.get("SPACE_ID"))
-    
-    def is_gpt_mode(self) -> bool:
-        """Check if using GPT provider"""
-        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
-
-# ---------------- 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
@@ -148,7 +55,6 @@ class ProxyConfig(BaseModel):
     enabled: bool = True
     url: HttpUrl
 
-# ---------------- API & Auth -------------
 class APIAuthConfig(BaseModel):
     enabled: bool = False
     token_endpoint: Optional[HttpUrl] = None
@@ -184,8 +90,100 @@ class APIConfig(BaseModel):
         extra = "allow"
         populate_by_name = True
 
+class LLMConfig(BaseModel):
+    repo_id: str
+    generation_config: Dict[str, Any] = {}
+    use_fine_tune: bool = False
+    fine_tune_zip: str = ""
+
+class VersionConfig(BaseModel):
+    id: int = Field(..., alias="version_number")
+    no: Optional[int] = None
+    caption: Optional[str] = ""
+    description: Optional[str] = ""
+    published: bool = False
+    deleted: bool = False
+    created_date: Optional[str] = None
+    created_by: Optional[str] = None
+    last_update_date: Optional[str] = None
+    last_update_user: Optional[str] = None
+    publish_date: Optional[str] = None
+    published_by: Optional[str] = None
+    general_prompt: str
+    welcome_prompt: Optional[str] = None
+    llm: LLMConfig
+    intents: List[IntentConfig]
+
+    class Config:
+        extra = "allow"
+        populate_by_name = True
+
+class ProjectConfig(BaseModel):
+    id: Optional[int] = None
+    name: str
+    caption: Optional[str] = ""
+    icon: Optional[str] = "folder"
+    description: Optional[str] = ""
+    enabled: bool = True
+    last_version_number: Optional[int] = None
+    version_id_counter: int = 1
+    versions: List[VersionConfig]
+    # Language settings - changed from default_language/supported_languages
+    default_locale: str = "tr"
+    supported_locales: List[str] = ["tr"]
+    timezone: Optional[str] = "Europe/Istanbul"
+    region: Optional[str] = "tr-TR"
+    deleted: bool = False
+    created_date: Optional[str] = None
+    created_by: Optional[str] = None
+    last_update_date: Optional[str] = None
+    last_update_user: Optional[str] = None
+
+    class Config:
+        extra = "allow"
+
+class ActivityLogEntry(BaseModel):
+    timestamp: str
+    username: str
+    action: str
+    entity_type: str
+    entity_id: Optional[int] = None
+    entity_name: Optional[str] = None
+    details: Optional[str] = None
+    
+class ParameterCollectionConfig(BaseModel):
+    """Configuration for smart parameter collection"""
+    max_params_per_question: int = Field(default=2, ge=1, le=5)
+    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"
 
-# ---------------- Intent / Param ---------
 class ParameterConfig(BaseModel):
     name: str
     caption: List[LocalizedCaption] = []  # Multi-language captions
@@ -229,6 +227,7 @@ class IntentConfig(BaseModel):
     name: str
     caption: Optional[str] = ""
     dependencies: List[str] = []
+    requiresApproval: bool = False 
     examples: List[LocalizedExample] = []
     detection_prompt: Optional[str] = None
     parameters: List[ParameterConfig] = []
@@ -256,67 +255,61 @@ class IntentConfig(BaseModel):
         # Return all examples if no locale match
         return [e.example for e in self.examples]
 
-# ---------------- Version / Project ------
-class LLMConfig(BaseModel):
-    repo_id: str
-    generation_config: Dict[str, Any] = {}
-    use_fine_tune: bool = False
-    fine_tune_zip: str = ""
-
-class VersionConfig(BaseModel):
-    id: int = Field(..., alias="version_number")
-    no: Optional[int] = None
-    caption: Optional[str] = ""
-    description: Optional[str] = ""
-    published: bool = False
-    deleted: bool = False
-    created_date: Optional[str] = None
-    created_by: Optional[str] = None
-    last_update_date: Optional[str] = None
-    last_update_user: Optional[str] = None
-    publish_date: Optional[str] = None
-    published_by: Optional[str] = None
-    general_prompt: str
-    llm: LLMConfig
-    intents: List[IntentConfig]
-
-    class Config:
-        extra = "allow"
-        populate_by_name = True
-
-class ProjectConfig(BaseModel):
-    id: Optional[int] = None
-    name: str
-    caption: Optional[str] = ""
-    icon: Optional[str] = "folder"
-    description: Optional[str] = ""
-    enabled: bool = True
-    last_version_number: Optional[int] = None
-    version_id_counter: int = 1
-    versions: List[VersionConfig]
-    # Language settings - changed from default_language/supported_languages
-    default_locale: str = "tr"
-    supported_locales: List[str] = ["tr"]
-    timezone: Optional[str] = "Europe/Istanbul"
-    region: Optional[str] = "tr-TR"
-    deleted: bool = False
-    created_date: Optional[str] = None
-    created_by: Optional[str] = None
-    last_update_date: Optional[str] = None
-    last_update_user: Optional[str] = None
-
-    class Config:
-        extra = "allow"
-
-# ---------------- Activity Log -----------
-class ActivityLogEntry(BaseModel):
-    timestamp: str
-    username: str
-    action: str
-    entity_type: str
-    entity_id: Optional[int] = None
-    entity_name: Optional[str] = None
-    details: Optional[str] = None
+# ===================== Global Configuration =====================
+class GlobalConfig(BaseModel):
+    # Provider settings (replaces work_mode, cloud_token, spark_endpoint)
+    llm_provider: ProviderSettings
+    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] = []
+    
+    # User management
+    users: List["UserConfig"] = []
+    
+    # Helper methods for providers
+    def get_provider_config(self, provider_type: str, provider_name: str) -> Optional[ProviderConfig]:
+        """Get provider configuration by type and name"""
+        return next(
+            (p for p in self.providers if p.type == provider_type and p.name == provider_name),
+            None
+        )
+    
+    def get_providers_by_type(self, provider_type: str) -> List[ProviderConfig]:
+        """Get all providers of a specific type"""
+        return [p for p in self.providers if p.type == provider_type]
+    
+    def get_plain_api_key(self, provider_type: str) -> Optional[str]:
+        """Get decrypted API key for a provider type"""
+        provider_map = {
+            "llm": self.llm_provider,
+            "tts": self.tts_provider,
+            "stt": self.stt_provider
+        }
+        provider = provider_map.get(provider_type)
+        if provider and provider.api_key:
+            if provider.api_key.startswith("enc:"):
+                return decrypt(provider.api_key)
+            return provider.api_key
+        return None
+    
+    # Backward compatibility helpers
+    def is_cloud_mode(self) -> bool:
+        """Check if running in cloud mode (HuggingFace)"""
+        return bool(os.environ.get("SPACE_ID"))
+    
+    def is_gpt_mode(self) -> bool:
+        """Check if using GPT provider"""
+        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
 
 # ---------------- Service Config ---------
 class ServiceConfig(BaseModel):
@@ -556,7 +549,6 @@ class ConfigProvider:
                 "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
                 })