Update config_provider.py

config_provider.py

@@ -97,8 +97,7 @@ class LLMConfig(BaseModel):
     fine_tune_zip: str = ""
 
 class VersionConfig(BaseModel):
-    id: int = Field(..., alias="version_number")
-    no: Optional[int] = None
+    no: int  # Tek version numarası alanı
     caption: Optional[str] = ""
     description: Optional[str] = ""
     published: bool = False
@@ -116,7 +115,6 @@ class VersionConfig(BaseModel):
 
     class Config:
         extra = "allow"
-        populate_by_name = True
 
 class ProjectConfig(BaseModel):
     id: Optional[int] = None
@@ -125,10 +123,8 @@ class ProjectConfig(BaseModel):
     icon: Optional[str] = "folder"
     description: Optional[str] = ""
     enabled: bool = True
-    last_version_number: Optional[int] = None
-    version_id_counter: int = 1
+    version_id_counter: int = 1  # last_version_number yerine sadece bu kullanılacak
     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"
@@ -225,17 +221,21 @@ class ParameterConfig(BaseModel):
 
 class IntentConfig(BaseModel):
     name: str
-    caption: Optional[str] = ""
+    caption: Union[str, List[LocalizedCaption]]
     dependencies: List[str] = []
-    requiresApproval: bool = False 
+    requiresApproval: bool = False  # YENİ ALAN
     examples: List[LocalizedExample] = []
-    detection_prompt: Optional[str] = None
+    detection_prompt: str
     parameters: List[ParameterConfig] = []
     action: str
-    requiresApproval: bool = False  
     fallback_timeout_prompt: Optional[str] = None
     fallback_error_prompt: Optional[str] = None
-
+    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"
         
@@ -667,11 +667,48 @@ class ConfigProvider:
     @classmethod
     def add_activity_log(cls, username: str, action: str, entity_type: str, 
                         entity_id: Optional[int] = None, entity_name: Optional[str] = None,
-                        details: Optional[str] = None):
-        """Add activity log entry"""
+                        details: Optional[Dict[str, Any]] = None) -> None:
+        """Add activity log entry with detailed context"""
         if cls._instance is None:
             cls.get()
         
+        # Build detailed context
+        detail_str = None
+        if details:
+            detail_str = json.dumps(details, ensure_ascii=False)
+        else:
+            # Auto-generate details based on action
+            if action == "CREATE_PROJECT":
+                detail_str = f"Created new project '{entity_name}'"
+            elif action == "UPDATE_PROJECT":
+                detail_str = f"Updated project configuration"
+            elif action == "DELETE_PROJECT":
+                detail_str = f"Soft deleted project '{entity_name}'"
+            elif action == "CREATE_VERSION":
+                detail_str = f"Created new version for {entity_name}"
+            elif action == "PUBLISH_VERSION":
+                detail_str = f"Published version {entity_id}"
+            elif action == "CREATE_INTENT":
+                detail_str = f"Added intent '{entity_name}'"
+            elif action == "UPDATE_INTENT":
+                detail_str = f"Modified intent configuration"
+            elif action == "DELETE_INTENT":
+                detail_str = f"Removed intent '{entity_name}'"
+            elif action == "CREATE_API":
+                detail_str = f"Created API endpoint '{entity_name}'"
+            elif action == "UPDATE_API":
+                detail_str = f"Modified API configuration"
+            elif action == "DELETE_API":
+                detail_str = f"Soft deleted API '{entity_name}'"
+            elif action == "LOGIN":
+                detail_str = f"User logged in"
+            elif action == "LOGOUT":
+                detail_str = f"User logged out"
+            elif action == "IMPORT_PROJECT":
+                detail_str = f"Imported project from file"
+            elif action == "EXPORT_PROJECT":
+                detail_str = f"Exported project '{entity_name}'"
+        
         entry = ActivityLogEntry(
             timestamp=datetime.now().isoformat() + "Z",
             username=username,
@@ -679,7 +716,7 @@ class ConfigProvider:
             entity_type=entity_type,
             entity_id=entity_id,
             entity_name=entity_name,
-            details=details
+            details=detail_str
         )
         
         cls._instance.activity_log.append(entry)
@@ -687,6 +724,9 @@ class ConfigProvider:
         # Keep only last 1000 entries
         if len(cls._instance.activity_log) > 1000:
             cls._instance.activity_log = cls._instance.activity_log[-1000:]
+        
+        # Save immediately for audit trail
+        cls._instance.save()
     
     @classmethod
     def update_environment(cls, update_data: dict, username: str) -> None:
@@ -747,6 +787,9 @@ class ConfigProvider:
         if any(p.name == project_data['name'] for p in cls._instance.projects if not p.deleted):
             raise ValueError(f"Project name '{project_data['name']}' already exists")
         
+        # Increment global project counter
+        cls._instance.project_id_counter += 1
+        
         # Create project
         new_project = ProjectConfig(
             id=cls._instance.project_id_counter,
@@ -770,9 +813,7 @@ class ConfigProvider:
         
         # Create initial version
         initial_version = VersionConfig(
-            id=1,
-            version_number=1,
-            no=1,
+            no=1,  # Sadece no kullan
             caption="Version 1",
             description="Initial version",
             published=False,
@@ -782,23 +823,21 @@ class ConfigProvider:
             last_update_date=datetime.now().isoformat() + "Z",
             last_update_user=username,
             general_prompt="You are a helpful assistant.",
+            welcome_prompt=None,
             llm=LLMConfig(
-                repo_id="",
+                repo_id="ytu-ce-cosmos/Turkish-Llama-8b-Instruct-v0.1",
                 generation_config={
-                    "max_new_tokens": 512,
-                    "temperature": 0.7,
-                    "top_p": 0.95
+                    "max_new_tokens": 256,
+                    "temperature": 0.7
                 }
             ),
             intents=[]
         )
         
         new_project.versions.append(initial_version)
-        new_project.last_version_number = 1
         
         # Add to config
         cls._instance.projects.append(new_project)
-        cls._instance.project_id_counter += 1
         
         # Add activity log
         cls.add_activity_log(username, "CREATE_PROJECT", "project", new_project.id, new_project.name)
@@ -1037,93 +1076,22 @@ class ConfigProvider:
         # Import versions
         for idx, version_data in enumerate(project_data.get("versions", [])):
             new_version = VersionConfig(
-                id=idx + 1,
-                version_number=idx + 1,
                 no=idx + 1,
-                caption=version_data.get("caption", f"Version {idx + 1}"),
+                caption=version_data.get("caption", f"v{idx + 1}"),
                 description=version_data.get("description", ""),
-                published=False,
-                deleted=False,
-                created_date=datetime.now().isoformat() + "Z",
-                created_by=username,
-                last_update_date=datetime.now().isoformat() + "Z",
-                last_update_user=username,
+                published=version_data.get("published", False),
                 general_prompt=version_data.get("general_prompt", ""),
-                llm=LLMConfig(**version_data.get("llm", {})) if version_data.get("llm") else LLMConfig(
-                    repo_id="",
-                    generation_config={
-                        "max_new_tokens": 512,
-                        "temperature": 0.7,
-                        "top_p": 0.95
-                    }
-                ),
-                intents=[]
+                welcome_prompt=version_data.get("welcome_prompt"),
+                llm=LLMConfig(**version_data.get("llm", {})),
+                intents=[IntentConfig(**i) for i in version_data.get("intents", [])],
+                created_date=datetime.now().isoformat() + "Z",
+                created_by=username
             )
-            
-            # Import intents
-            for intent_data in version_data.get("intents", []):
-                intent = IntentConfig(
-                    name=intent_data.get("name", ""),
-                    caption=intent_data.get("caption", ""),
-                    detection_prompt=intent_data.get("detection_prompt", ""),
-                    action=intent_data.get("action", ""),
-                    fallback_timeout_prompt=intent_data.get("fallback_timeout_prompt"),
-                    fallback_error_prompt=intent_data.get("fallback_error_prompt"),
-                    examples=[],
-                    parameters=[]
-                )
-                
-                # Convert examples
-                if "examples" in intent_data:
-                    if isinstance(intent_data["examples"], list):
-                        for example in intent_data["examples"]:
-                            if isinstance(example, str):
-                                # Old format - use project default locale
-                                intent.examples.append(LocalizedExample(
-                                    locale_code=new_project.default_locale,
-                                    example=example
-                                ))
-                            elif isinstance(example, dict):
-                                # New format
-                                intent.examples.append(LocalizedExample(**example))
-                
-                # Convert parameters
-                for param_data in intent_data.get("parameters", []):
-                    param = ParameterConfig(
-                        name=param_data.get("name", ""),
-                        type=param_data.get("type", "str"),
-                        required=param_data.get("required", True),
-                        variable_name=param_data.get("variable_name", param_data.get("name", "")),
-                        extraction_prompt=param_data.get("extraction_prompt"),
-                        validation_regex=param_data.get("validation_regex"),
-                        invalid_prompt=param_data.get("invalid_prompt"),
-                        type_error_prompt=param_data.get("type_error_prompt"),
-                        caption=[]
-                    )
-                    
-                    # Convert caption
-                    if "caption" in param_data:
-                        if isinstance(param_data["caption"], str):
-                            # Old format
-                            param.caption.append(LocalizedCaption(
-                                locale_code=new_project.default_locale,
-                                caption=param_data["caption"]
-                            ))
-                        elif isinstance(param_data["caption"], list):
-                            # New format
-                            for cap in param_data["caption"]:
-                                param.caption.append(LocalizedCaption(**cap))
-                    
-                    intent.parameters.append(param)
-                
-                new_version.intents.append(intent)
-            
             new_project.versions.append(new_version)
-            new_project.last_version_number = new_version.id
-        
-        # Update project counter if needed
-        new_project.version_id_counter = len(new_project.versions) + 1
-        
+            
+            # Update version counter
+            new_project.version_id_counter = max(new_project.version_id_counter, new_version.no)
+               
         # Save
         cls._instance.save()