Changes in schemas.py

Modified schemas according to best practice

anansyTypes/schemas.py

@@ -1,59 +1,82 @@
 from pydantic import BaseModel as PydanticBaseModel
 from typing import List, Any, Dict,Union
 from .structures import Embedding,Word, Symbol,Phrase
+from pydantic import field_validator, ConfigDict
 
 class ModifiedBaseModel(PydanticBaseModel):
-    class Config:
-        arbitrary_types_allowed = True
-
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+    
+    @field_validator('*', mode='before')
+    @classmethod
+    def convert_custom_types(cls, v):
+        if isinstance(v, Word):
+            return {
+                'id': v.id,
+                'content': v.content,
+                'embedding': {'data': v.embedding.data.tolist()}
+            }
+        if isinstance(v, Phrase):
+            return {
+                'id': v.id,
+                'content': v.content,
+                'embedding': {'data': v.embedding.data.tolist()}
+            }
+        if isinstance(v, Symbol):
+            return {
+                'id': v.id,
+                'label': v.label,
+                'image': v.image.tolist()
+            }
+        if isinstance(v, Embedding):
+            return {'data': v.data.tolist()}
+        if isinstance(v, list):
+            return [cls.convert_custom_types(item) for item in v]
+        return v
 
 
 class EmbeddingRequest(ModifiedBaseModel):
     stemmed_words: List[str]
     tokens: dict
-class EmbeddingResponse(ModifiedBaseModel):
-    embeddings: List[Embedding]
 
+class EmbeddingResponse(ModifiedBaseModel):
+    embeddings: List[dict]
 
 class ResponseRequest(ModifiedBaseModel):
     text: str
     context: Dict[str, Any]
-    
-    
+
 class PreprocessRequest(ModifiedBaseModel):
     text: str
 
 class PreprocessResponse(ModifiedBaseModel):
     raw_words: List[str]
     tokens: Dict[str, Any]
-    
-    
+
 class GetSymbolRequest(ModifiedBaseModel):
     lexeme_id: int
-    
+
 class GetSymbolResponse(ModifiedBaseModel):
-    symbol: Symbol
-    
+    symbol: dict
+
 class GetWordRequest(ModifiedBaseModel):
     word_text: str
     stemmed: bool = False
-    
 
 class GetWordResponse(ModifiedBaseModel):
-    word:Union[Word,None]
-    
+    word: Union[dict, None]
+
 class GetSimilarWordRequest(ModifiedBaseModel):
-    embedding: Embedding
-    
+    embedding: dict
+
 class GetAllPhrasesResponse(ModifiedBaseModel):
-    phrases: List[Phrase]
-    
+    phrases: List[dict]
+
 class GetTranscriptionRequest(ModifiedBaseModel):
     audio_data: bytes
 
 class GetTranscriptionResponse(ModifiedBaseModel):
     transcription: str
-    
+