fix: added new features

.gitignore

@@ -30,3 +30,4 @@ unoplat-code-confluence/nodeparser/__pycache__
 unoplat-code-confluence/nodeparser/tests/__pycache__
 unoplat-code-confluence/settings/__pycache__
 unoplat-code-confluence/utility/__pycache__
+unoplat-code-confluence/data_models/dspy/__pycache__

unoplat-code-confluence/data_models/chapi_unoplat_annotation.py

@@ -1,9 +1,11 @@
+from data_models.chapi_unoplat_annotation_key_val import ChapiUnoplatAnnotationKeyVal
 from data_models.chapi_unoplat_position import Position
-from pydantic import  Field
+from pydantic import  BaseModel, Field
 from typing import Optional
 
-from data_models.dspy.dspy_unoplat_fs_annotation_subset import DspyUnoplatAnnotationSubset
 
 
-class Annotation(DspyUnoplatAnnotationSubset):
+class Annotation(BaseModel):
+    name: Optional[str] = Field(default=None, alias="Name")
+    key_values: Optional[list[ChapiUnoplatAnnotationKeyVal]] = Field(default_factory=list, alias="KeyValues")
     position: Optional[Position] = Field(default=None, alias="Position")

unoplat-code-confluence/data_models/chapi_unoplat_node.py

@@ -1,15 +1,15 @@
-from pydantic import Field
+from pydantic import BaseModel, Field
 from typing import Optional, List
 from data_models.chapi_unoplat_annotation import Annotation
 from data_models.chapi_unoplat_class_summary import ClassSummary
 from data_models.chapi_unoplat_class_fieldmodel import ClassFieldModel
 from data_models.chapi_unoplat_import import Import
 from data_models.chapi_unoplat_function import Function
 from data_models.chapi_unoplat_position import Position
-from data_models.dspy.dspy_unoplat_fs_node_subset import DspyUnoplatNodeSubset
 
 
-class Node(DspyUnoplatNodeSubset):
+
+class Node(BaseModel):
     node_name: Optional[str] = Field(default=None, alias="NodeName")
     type: Optional[str] = Field(default=None, alias="Type")
     file_path: Optional[str] = Field(default=None, alias="FilePath")

unoplat-code-confluence/data_models/dspy/dspy_unoplat_fs_function_call_subset.py

@@ -8,5 +8,5 @@
 class DspyUnoplatFunctionCallSubset(FunctionCall):
     node_name: Optional[str] = Field(default=None, alias="NodeName")
     function_name: Optional[str] = Field(default=None, alias="FunctionName")
-    parameters: List[Parameter] = Field(default_factory=list, alias="Parameters")
+    parameters: Optional[List[Parameter]] = Field(default_factory=list, alias="Parameters")
 

unoplat-code-confluence/data_models/dspy/dspy_unoplat_fs_function_subset.py

@@ -9,9 +9,9 @@
 class DspyUnoplatFunctionSubset(BaseModel):
     name: Optional[str] = Field(default=None, alias="Name")
     return_type: Optional[str] = Field(default=None, alias="ReturnType")
-    function_calls: List[DspyUnoplatFunctionCallSubset] = Field(default_factory=list, alias="FunctionCalls")
-    annotations: List[DspyUnoplatAnnotationSubset] = Field(default_factory=list, alias="Annotations")
-    local_variables: List[UnoplatFunctionFieldModel] = Field(default_factory=list, alias="LocalVariables")
+    function_calls: Optional[List[DspyUnoplatFunctionCallSubset]] = Field(default_factory=list, alias="FunctionCalls")
+    annotations: Optional[List[DspyUnoplatAnnotationSubset]] = Field(default_factory=list, alias="Annotations")
+    local_variables: Optional[List[UnoplatFunctionFieldModel]] = Field(default_factory=list, alias="LocalVariables")
     content: Optional[str] = Field(default=None, alias="Content")
 
 

unoplat-code-confluence/data_models/dspy/dspy_unoplat_fs_node_subset.py

@@ -7,9 +7,9 @@
 
 
 class DspyUnoplatNodeSubset(BaseModel):
-    node_name: Optional[str] = Field(default=None, alias="NodeName",description="This is name of the class.")
-    multiple_extend: Optional[bool] = Field(default=None, alias="MultipleExtend",description="this includes if class is inheriting multiple classes")
-    fields: List[ClassFieldModel] = Field(default_factory=list, alias="Fields",description="This includes class fields")
-    extend: Optional[str] = Field(default=None, alias="Extend",description="This includes class inheritance")
-    imports: List[Import] = Field(default_factory=list, alias="Imports",description="This includes class imports which can be used to infer types of fields")
-    annotations: List[DspyUnoplatAnnotationSubset] = Field(default_factory=list, alias="Annotations")
+    node_name: Optional[str] = Field(default=None, alias="NodeName", description="This is name of the class.")
+    multiple_extend: Optional[bool] = Field(default=None, alias="MultipleExtend", description="this includes if class is inheriting multiple classes")
+    fields: Optional[List[ClassFieldModel]] = Field(default_factory=List, alias="Fields", description="This includes class fields")
+    extend: Optional[str] = Field(default=None, alias="Extend", description="This includes class inheritance")
+    imports: Optional[List[Import]] = Field(default_factory=List, alias="Imports", description="This includes class imports which can be used to infer types of fields")
+    annotations: Optional[List[DspyUnoplatAnnotationSubset]] = Field(default_factory=list, alias="Annotations")