Update main.py

main.py

@@ -7,7 +7,8 @@ from pydub import AudioSegment
 from fastapi import FastAPI, UploadFile, File, Form, Depends, HTTPException, status
 from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
 from fastapi.concurrency import run_in_threadpool
-from pydantic import BaseModel, Field, BaseSettings
+from pydantic import BaseModel, Field # Убрали BaseSettings отсюда
+from pydantic_settings import BaseSettings # <--- ИЗМЕНЕННЫЙ ИМПОРТ
 from typing import List, Dict, Optional, Tuple, Any
 import tempfile
 import uvicorn
@@ -21,7 +22,7 @@ class Settings(BaseSettings):
     log_level: str = "INFO"
 
     class Config:
-        env_file = ".env" 
+        env_file = ".env"
         env_file_encoding = 'utf-8'
 
 settings = Settings()
@@ -160,16 +161,16 @@ class ModalityType(str):
     IMU = "imu"
 
 class EmbeddingItem(BaseModel):
-    id: str = Field(..., description="Identifier of the item (e.g., filename or text content)")
-    embedding: List[float] = Field(..., description="The computed embedding vector")
+    id: str
+    embedding: List[float]
 
 class EmbeddingPayload(BaseModel):
-    vision: Optional[List[EmbeddingItem]] = Field(None, description="List of vision embeddings")
-    audio: Optional[List[EmbeddingItem]] = Field(None, description="List of audio embeddings")
-    text: Optional[List[EmbeddingItem]] = Field(None, description="List of text embeddings")
-    depth: Optional[List[EmbeddingItem]] = Field(None, description="List of depth embeddings (future support)")
-    thermal: Optional[List[EmbeddingItem]] = Field(None, description="List of thermal embeddings (future support)")
-    imu: Optional[List[EmbeddingItem]] = Field(None, description="List of IMU embeddings (future support)")
+    vision: Optional[List[EmbeddingItem]] = None
+    audio: Optional[List[EmbeddingItem]] = None
+    text: Optional[List[EmbeddingItem]] = None
+    depth: Optional[List[EmbeddingItem]] = None
+    thermal: Optional[List[EmbeddingItem]] = None
+    imu: Optional[List[EmbeddingItem]] = None
 
 class EmbeddingResponse(BaseModel):
     embeddings: EmbeddingPayload
@@ -180,15 +181,15 @@ class SimilarityMatch(BaseModel):
     item_b_id: str
     modality_a: ModalityType
     modality_b: ModalityType
-    score: float = Field(..., ge=0.0, le=1.0001)
+    score: float
 
 class SimilarityRequest(BaseModel):
-    embeddings_payload: EmbeddingPayload = Field(..., description="Payload containing embeddings from the /compute_embeddings endpoint")
-    threshold: float = Field(0.5, ge=0.0, le=1.0, description="Minimum similarity score to include in results")
-    top_k: Optional[int] = Field(None, gt=0, description="Maximum number of matches to return per modality pair comparison. If None, all matches above threshold are returned.")
-    normalize_scores: bool = Field(True, description="Whether to normalize embeddings before computing cosine similarity (recommended)")
-    compare_within_modalities: bool = Field(True, description="Compare items within the same modality (e.g., image1 vs image2)")
-    compare_across_modalities: bool = Field(True, description="Compare items across different modalities (e.g., image1 vs text1)")
+    embeddings_payload: EmbeddingPayload
+    threshold: float = 0.5
+    top_k: Optional[int] = None
+    normalize_scores: bool = True
+    compare_within_modalities: bool = True
+    compare_across_modalities: bool = True
 
 class SimilarityResponse(BaseModel):
     matches: List[SimilarityMatch]
@@ -197,9 +198,9 @@ class SimilarityResponse(BaseModel):
 
 @app.post("/compute_embeddings", response_model=EmbeddingResponse, dependencies=[Depends(verify_token)])
 async def generate_embeddings_endpoint(
-    texts: Optional[List[str]] = Form(None, description="List of text strings to embed."),
-    images: Optional[List[UploadFile]] = File(default=None, description="List of image files."),
-    audio_files: Optional[List[UploadFile]] = File(default=None, description="List of audio files (MP3, WAV, etc.).")
+    texts: Optional[List[str]] = Form(None),
+    images: Optional[List[UploadFile]] = File(default=None),
+    audio_files: Optional[List[UploadFile]] = File(default=None)
 ):
     if embedding_manager is None:
         raise HTTPException(status_code=503, detail="Embedding manager not initialized.")