Update output_parser.py

output_parser.py

@@ -2,20 +2,13 @@ from typing import List, Optional
 from pydantic import BaseModel, Field
 import json
 
-class SpeakerAnalysis(BaseModel):
-    Speaker: str = "Unknown Speaker"
-    GeneralImpression: str = "No general impression provided"
-    AttachmentStyle: Optional['AttachmentStyle'] = None
-    BigFiveTraits: Optional['BigFiveTraits'] = None
-    PersonalityDisorder: Optional['PersonalityDisorder'] = None
-
 class AttachmentStyle(BaseModel):
-    Secured: float = Field(0.0, alias="Secured")
+    Secured: float = 0.0
     Anxious_Preoccupied: float = Field(0.0, alias="Anxious-Preoccupied")
     Dismissive_Avoidant: float = Field(0.0, alias="Dismissive-Avoidant")
     Fearful_Avoidant: float = Field(0.0, alias="Fearful-Avoidant")
-    Self: int = Field(0, alias="Self")
-    Others: int = Field(0, alias="Others")
+    Self: int = 0
+    Others: int = 0
     Anxiety: int = 0
     Avoidance: int = 0
     Explanation: str = "No explanation provided"
@@ -40,6 +33,13 @@ class PersonalityDisorder(BaseModel):
     Obsessional: int = 0
     Explanation: str = "No explanation provided"
 
+class SpeakerAnalysis(BaseModel):
+    Speaker: str = "Unknown Speaker"
+    GeneralImpression: str = "No general impression provided"
+    AttachmentStyle: AttachmentStyle = AttachmentStyle()
+    BigFiveTraits: BigFiveTraits = BigFiveTraits()
+    PersonalityDisorder: PersonalityDisorder = PersonalityDisorder()
+
 class OutputParser:
     def parse(self, text: str) -> List[SpeakerAnalysis]:
         try:
@@ -56,10 +56,10 @@ class OutputParser:
     def parse_speaker_analysis(self, obj: dict) -> SpeakerAnalysis:
         return SpeakerAnalysis(
             Speaker=obj.get("Speaker", "Unknown Speaker"),
-            GeneralImpression=obj.get("GeneralImpression", "No general impression provided"),
-            AttachmentStyle=AttachmentStyle(**obj.get("attachment_styles", {})),
-            BigFiveTraits=BigFiveTraits(**obj.get("big_five_traits", {})),
-            PersonalityDisorder=PersonalityDisorder(**obj.get("personality_disorders", {}))
+            GeneralImpression=obj.get("General Impression", "No general impression provided"),
+            AttachmentStyle=AttachmentStyle(**(obj.get("Attachment Styles", {}))),
+            BigFiveTraits=BigFiveTraits(**(obj.get("Big Five Traits", {}))),
+            PersonalityDisorder=PersonalityDisorder(**(obj.get("Personality Disorders", {})))
         )
 
     def get_format_instructions(self) -> str: