feat: merge conflict resolution

Author: THLyon

Containers/generate.js

@@ -1,8 +1,8 @@
 const fs = require('fs');
 const { exec } = require('child_process');
 
-// Generate the base TypeScript file from OpenAPI
-exec('npx openapi-typescript /app/api.json -o /app/models.ts', (error, stdout, stderr) => {
+// Generate the base TypeScript file from OpenAPI using the --enum flag
+exec('npx openapi-typescript /app/api.json -o /app/models.ts --enum', (error, stdout, stderr) => {
   if (error) {
     console.error('Error generating TypeScript types:', error);
     console.error(stderr);

model/equaliq.smithy

@@ -22,11 +22,24 @@ service EqualIQ {
         UploadProfilePicture
         UpdateProfile
         Ping
+        ExposeTypes
         SignContract
         GetContractSignatures
         UpdateSignatureStatus
         DeleteContractSignature
     ]
+
+}
+
+// When changing APIs, we sometimes want to expose unified types that aren't directly tied to any API.
+structure ExposedTypes { 
+  QASectionsList: QASectionsList
+}
+
+// This API is used simply to expose types
+@http(method: "POST", uri: "/notARealEndpoint")
+operation ExposeTypes {
+    output: ExposedTypes
 }
 
 // Types
@@ -60,6 +73,18 @@ enum AccountType {
     MANAGER = "manager"
     LAWYER = "lawyer"
     PRODUCER = "producer"
+    PUBLISHER = "publisher"
+}
+
+enum SignatureStatus {
+    SIGNED = "signed"
+    DECLINED = "declined"
+    PENDING = "pending"
+}
+
+enum SignContractResult {
+    SUCCESS 
+    FAILURE
 }
 
 enum SignatureStatus {
@@ -102,10 +127,10 @@ structure GetContractOutput {
     type: ContractType
 
     @required
-    terms: Document
+    terms: TermsList
 
     @required
-    iq_qa: QASections
+    qa_sections: String
 
     @required
     isOwner: Boolean
@@ -117,31 +142,26 @@ structure GetContractOutput {
     sharedWith: UserIdList
 }
 
-structure QASections {
-    @required
-    sections: SectionList
-}
-
-list SectionList {
+list QASectionsList {
     member: QASection
 }
 
 structure QASection {
     @required
-    title: String
-
+    section: String
+    
     @required
-    questions: QuestionList
+    qa: QAList
 }
 
-list QuestionList {
-    member: Question
+list QAList {
+    member: QA
 }
 
-structure Question {
+structure QA {
     @required
     question: String
-
+    
     @required
     answer: String
 }
@@ -490,6 +510,54 @@ structure PingOutput {
     message: String
 }
 
+// Contract Terms structures
+list TermsList {
+    member: Term
+}
+
+structure Term {
+    @required
+    name: String
+    
+    @required
+    definition: String
+    
+    @required
+    unitType: String
+    
+    citation: String
+    
+    fixedValues: FixedValueTermInference
+    
+    // Additional properties will be serialized as part of the Document
+}
+
+structure FixedValueTermInference {
+    @required
+    primary: FixedTermValue
+    
+    subterms: FixedTermValueList
+}
+
+list FixedTermValueList {
+    member: FixedTermValue
+}
+
+structure FixedTermValue {
+    @required
+    unit: String
+    
+    @required
+    value: String
+    
+    name: String
+    
+    numericValue: Float
+    
+    condition: String
+}
+
+
 // Common structures
 document Document
 

python/api_model/types/models.py

@@ -15,6 +15,7 @@ class AccountType(Enum):
     manager = 'manager'
     lawyer = 'lawyer'
     producer = 'producer'
+    publisher = 'publisher'
 
 
 class AuthenticationErrorResponseContent(BaseModel):
@@ -52,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 DeleteContractSignatureRequestContent(BaseModel):
     contractId: str
 
@@ -105,11 +119,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
 
@@ -126,6 +145,14 @@ class SharedUserDetails(BaseModel):
     sharedTime: float
 
 
+class Term(BaseModel):
+    name: str
+    definition: str
+    unitType: str
+    citation: Optional[str] = None
+    fixedValues: Optional[FixedValueTermInference] = None
+
+
 class SignContractResult(Enum):
     SUCCESS = 'SUCCESS'
     FAILURE = 'FAILURE'
@@ -215,6 +242,21 @@ class ContractSummaryItem(BaseModel):
     sharedEmails: Optional[List[str]] = None
 
 
+class ExposeTypesResponseContent(BaseModel):
+    QASectionsList: Optional[List[QASection]] = None
+
+
+class GetContractResponseContent(BaseModel):
+    contractId: str = Field(..., pattern='^[A-Za-z0-9-]+$')
+    name: str
+    type: ContractType
+    terms: List[Term]
+    qa_sections: str
+    isOwner: bool
+    ownerId: str = Field(..., pattern='^[A-Za-z0-9-]+$')
+    sharedWith: List[SharedWithItem]
+
+
 class DeleteContractSignatureResponseContent(BaseModel):
     result: Optional[SignContractResult] = None
     message: Optional[str] = None
@@ -239,15 +281,6 @@ 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-]+$')

typescript/src/index.ts

@@ -19,6 +19,9 @@ export type ContractSummaryItem = ExtractSchema<'ContractSummaryItem'>
 export type ContractType = ExtractSchema<'ContractType'>
 export type DeleteContractRequestContent = ExtractSchema<'DeleteContractRequestContent'>
 export type DeleteContractResponseContent = ExtractSchema<'DeleteContractResponseContent'>
+export type ExposeTypesResponseContent = ExtractSchema<'ExposeTypesResponseContent'>
+export type FixedTermValue = ExtractSchema<'FixedTermValue'>
+export type FixedValueTermInference = ExtractSchema<'FixedValueTermInference'>
 export type DeleteContractSignatureRequestContent = ExtractSchema<'DeleteContractSignatureRequestContent'>
 export type DeleteContractSignatureResponseContent = ExtractSchema<'DeleteContractSignatureResponseContent'>
 export type GetContractReadURLRequestContent = ExtractSchema<'GetContractReadURLRequestContent'>
@@ -38,13 +41,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 SignContractRequestContent = ExtractSchema<'SignContractRequestContent'>
 export type SignContractResponseContent = ExtractSchema<'SignContractResponseContent'>
 export type SignContractResult = ExtractSchema<'SignContractResult'>