Update model for QA pt2

Author: ParkerVR

model/equaliq.smithy

@@ -103,7 +103,6 @@ structure GetContractOutput {
     sharedWith: UserIdList
 }
 
-// Define QA Section format to match existing implementation
 list QASectionsList {
     member: QASection
 }

python/api_model/types/models.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  api.json
-#   timestamp: 2025-05-19T10:27:09+00:00
+#   timestamp: 2025-05-24T20:24:25+00:00
 
 from __future__ import annotations
 
@@ -53,6 +53,19 @@ class DeleteContractResponseContent(BaseModel):
     success: bool
 
 
+class FixedTermValue(BaseModel):
+    unit: str
+    value: str
+    name: Optional[str] = None
+    numericValue: Optional[float] = None
+    condition: Optional[str] = None
+
+
+class FixedValueTermInference(BaseModel):
+    primary: FixedTermValue
+    subterms: Optional[List[FixedTermValue]] = None
+
+
 class GetContractReadURLRequestContent(BaseModel):
     contractId: str = Field(..., pattern='^[A-Za-z0-9-]+$')
 
@@ -98,11 +111,16 @@ class ProcessingIncompleteErrorResponseContent(BaseModel):
     message: str
 
 
-class Question(BaseModel):
+class QA(BaseModel):
     question: str
     answer: str
 
 
+class QASection(BaseModel):
+    section: str
+    qa: List[QA]
+
+
 class ResourceNotFoundErrorResponseContent(BaseModel):
     message: str
 
@@ -119,6 +137,14 @@ class SharedUserDetails(BaseModel):
     sharedTime: float
 
 
+class Term(BaseModel):
+    name: str
+    definition: str
+    unitType: str
+    citation: Optional[str] = None
+    fixedValues: Optional[FixedValueTermInference] = None
+
+
 class UpdateContractRequestContent(BaseModel):
     contractId: str = Field(..., pattern='^[A-Za-z0-9-]+$')
     name: str
@@ -181,6 +207,17 @@ class ContractSummaryItem(BaseModel):
     sharedEmails: Optional[List[str]] = None
 
 
+class GetContractResponseContent(BaseModel):
+    contractId: str = Field(..., pattern='^[A-Za-z0-9-]+$')
+    name: str
+    type: ContractType
+    terms: List[Term]
+    qa_sections: List[QASection]
+    isOwner: bool
+    ownerId: str = Field(..., pattern='^[A-Za-z0-9-]+$')
+    sharedWith: List[SharedWithItem]
+
+
 class GetProfileResponseContent(BaseModel):
     userId: str = Field(..., pattern='^[A-Za-z0-9-]+$')
     profile: UserProfile
@@ -195,30 +232,10 @@ class ListContractsResponseContent(BaseModel):
     shared: List[ContractSummaryItem]
 
 
-class QASection(BaseModel):
-    title: str
-    questions: List[Question]
-
-
-class QASections(BaseModel):
-    sections: List[QASection]
-
-
 class ShareContractResponseContent(BaseModel):
     success: bool
     contractId: str = Field(..., pattern='^[A-Za-z0-9-]+$')
     sharedWith: List[SharedUserDetails]
     added: Optional[List[str]] = None
     removed: Optional[List[str]] = None
     invalidRemoves: Optional[List[str]] = None
-
-
-class GetContractResponseContent(BaseModel):
-    contractId: str = Field(..., pattern='^[A-Za-z0-9-]+$')
-    name: str
-    type: ContractType
-    terms: Any
-    iq_qa: QASections
-    isOwner: bool
-    ownerId: str = Field(..., pattern='^[A-Za-z0-9-]+$')
-    sharedWith: List[SharedWithItem]

typescript/src/index.ts

@@ -18,6 +18,8 @@ export type ContractSummaryItem = ExtractSchema<'ContractSummaryItem'>
 export type ContractType = ExtractSchema<'ContractType'>
 export type DeleteContractRequestContent = ExtractSchema<'DeleteContractRequestContent'>
 export type DeleteContractResponseContent = ExtractSchema<'DeleteContractResponseContent'>
+export type FixedTermValue = ExtractSchema<'FixedTermValue'>
+export type FixedValueTermInference = ExtractSchema<'FixedValueTermInference'>
 export type GetContractReadURLRequestContent = ExtractSchema<'GetContractReadURLRequestContent'>
 export type GetContractReadURLResponseContent = ExtractSchema<'GetContractReadURLResponseContent'>
 export type GetContractRequestContent = ExtractSchema<'GetContractRequestContent'>
@@ -33,13 +35,13 @@ export type ListContractsResponseContent = ExtractSchema<'ListContractsResponseC
 export type PingResponseContent = ExtractSchema<'PingResponseContent'>
 export type PresignedPostData = ExtractSchema<'PresignedPostData'>
 export type ProcessingIncompleteErrorResponseContent = ExtractSchema<'ProcessingIncompleteErrorResponseContent'>
+export type QA = ExtractSchema<'QA'>
 export type QASection = ExtractSchema<'QASection'>
-export type QASections = ExtractSchema<'QASections'>
-export type Question = ExtractSchema<'Question'>
 export type ResourceNotFoundErrorResponseContent = ExtractSchema<'ResourceNotFoundErrorResponseContent'>
 export type ShareContractRequestContent = ExtractSchema<'ShareContractRequestContent'>
 export type ShareContractResponseContent = ExtractSchema<'ShareContractResponseContent'>
 export type SharedUserDetails = ExtractSchema<'SharedUserDetails'>
+export type Term = ExtractSchema<'Term'>
 export type UpdateContractRequestContent = ExtractSchema<'UpdateContractRequestContent'>
 export type UpdateContractResponseContent = ExtractSchema<'UpdateContractResponseContent'>
 export type UpdateProfileRequestContent = ExtractSchema<'UpdateProfileRequestContent'>

typescript/src/models.ts

@@ -228,6 +228,18 @@ export interface components {
         DeleteContractResponseContent: {
             success: boolean;
         };
+        FixedTermValue: {
+            unit: string;
+            value: string;
+            name?: string;
+            /** Format: float */
+            numericValue?: number;
+            condition?: string;
+        };
+        FixedValueTermInference: {
+            primary: components["schemas"]["FixedTermValue"];
+            subterms?: components["schemas"]["FixedTermValue"][];
+        };
         GetContractReadURLRequestContent: {
             contractId: string;
         };
@@ -241,8 +253,8 @@ export interface components {
             contractId: string;
             name: string;
             type: components["schemas"]["ContractType"];
-            terms: unknown;
-            iq_qa: components["schemas"]["QASections"];
+            terms: components["schemas"]["Term"][];
+            qa_sections: components["schemas"]["QASection"][];
             isOwner: boolean;
             ownerId: string;
             sharedWith: string[];
@@ -283,17 +295,14 @@ export interface components {
         ProcessingIncompleteErrorResponseContent: {
             message: string;
         };
-        QASection: {
-            title: string;
-            questions: components["schemas"]["Question"][];
-        };
-        QASections: {
-            sections: components["schemas"]["QASection"][];
-        };
-        Question: {
+        QA: {
             question: string;
             answer: string;
         };
+        QASection: {
+            section: string;
+            qa: components["schemas"]["QA"][];
+        };
         ResourceNotFoundErrorResponseContent: {
             message: string;
         };
@@ -316,6 +325,13 @@ export interface components {
             /** Format: double */
             sharedTime: number;
         };
+        Term: {
+            name: string;
+            definition: string;
+            unitType: string;
+            citation?: string;
+            fixedValues?: components["schemas"]["FixedValueTermInference"];
+        };
         UpdateContractRequestContent: {
             contractId: string;
             name: string;