yet another spec alteration

Author: TudorCRL

packages/flow-client/models/ConcurrentSessionUsageInfo.ts

@@ -1,8 +1,9 @@
 interface ConcurrentSessionUsageInfo {
-  message: 'Info';
-  type: 'concurrent_session_usage';
+  reason: string;
+  message: string;
   usage: number;
   quota: number;
   last_udpated?: string;
+  type: 'concurrent_session_usage';
 }
 export type { ConcurrentSessionUsageInfo };

packages/flow-client/models/ConversationDurationLimitInfo.ts

@@ -1,6 +1,7 @@
 interface ConversationDurationLimitInfo {
-  message: 'Info';
-  type: 'conversation_duration_limit';
+  reason: string;
+  message: string;
   conversation_duration_limit: number;
+  type: 'conversation_duration_limit';
 }
 export type { ConversationDurationLimitInfo };

packages/flow-client/models/ConversationTermination.ts

@@ -0,0 +1,7 @@
+interface ConversationTerminationWarning {
+  reason: string;
+  message: string;
+  conversation_termination: number;
+  type: 'conversation_termination';
+}
+export type { ConversationTerminationWarning };

packages/flow-client/models/ConversationTerminationWarning.ts

@@ -7,8 +7,8 @@ import type { ResponseCompleted } from './ResponseCompleted';
 import type { ResponseInterrupted } from './ResponseInterrupted';
 import type { ToolInvoke } from './ToolInvoke';
 import type { ErrorType } from './ErrorType';
-import type { DefaultWarning } from './DefaultWarning';
-import type { ConversationTermination } from './ConversationTermination';
+import type { Warning } from './Warning';
+import type { ConversationTerminationWarning } from './ConversationTerminationWarning';
 import type { Info } from './Info';
 import type { StatusUpdateInfo } from './StatusUpdateInfo';
 import type { ConversationDurationLimitInfo } from './ConversationDurationLimitInfo';
@@ -25,8 +25,8 @@ type FlowServerMessage =
   | ResponseInterrupted
   | ToolInvoke
   | ErrorType
-  | DefaultWarning
-  | ConversationTermination
+  | Warning
+  | ConversationTerminationWarning
   | Info
   | StatusUpdateInfo
   | ConversationDurationLimitInfo

packages/flow-client/models/FlowServerMessage.ts

@@ -1,6 +1,6 @@
 interface Info {
-  message: 'Info';
-  type: string;
   reason: string;
+  message: string;
+  type: string;
 }
 export type { Info };

packages/flow-client/models/Info.ts

@@ -1,7 +1,8 @@
 import type { StatusUpdateInfoEvent } from './StatusUpdateInfoEvent';
 interface StatusUpdateInfo {
-  message: 'Info';
-  type: 'status_update';
+  reason: string;
+  message: string;
   event: StatusUpdateInfoEvent;
+  type: 'status_update';
 }
 export type { StatusUpdateInfo };

packages/flow-client/models/StatusUpdateInfo.ts

@@ -1,7 +1,7 @@
 import type { WarningTypeEnum } from './WarningTypeEnum';
-interface DefaultWarning {
-  message: 'Warning';
-  type: WarningTypeEnum;
+interface Warning {
   reason: string;
+  message: string;
+  type: WarningTypeEnum;
 }
-export type { DefaultWarning };
+export type { Warning };

packages/flow-client/models/DefaultWarning.ts renamed to packages/flow-client/models/Warning.ts

@@ -37,9 +37,9 @@ export * from './ToolInvoke';
 export * from './ToolFunction';
 export * from './ErrorType';
 export * from './ErrorTypeEnum';
-export * from './DefaultWarning';
+export * from './Warning';
 export * from './WarningTypeEnum';
-export * from './ConversationTermination';
+export * from './ConversationTerminationWarning';
 export * from './Info';
 export * from './StatusUpdateInfo';
 export * from './StatusUpdateInfoEvent';

packages/flow-client/models/index.ts

@@ -169,7 +169,7 @@ components:
     Warning:
       summary: Warning messages sent from the server to the client.
       payload:
-        $ref: "#/components/schemas/Warning"
+        $ref: "#/components/schemas/WarningMessage"
     Error:
       summary: Error messages sent from the server to the client.
       payload:
@@ -550,13 +550,6 @@ components:
           type: string
           description: The content of the tool result.
 
-    BaseInfo:
-      properties:
-        message:
-          const: Info
-      required:
-        - message
-
     InfoMessage:
       type: object
       oneOf:
@@ -565,6 +558,15 @@ components:
         - $ref: '#/components/schemas/ConversationDurationLimitInfo'
         - $ref: '#/components/schemas/ConcurrentSessionUsageInfo'
 
+    BaseInfo:
+      properties:
+        reason:
+          type: string
+        message:
+          const: Info
+      required:
+        - reason
+        - message
 
     Info:
       allOf:
@@ -573,21 +575,18 @@ components:
           properties:
             type:
               type: string
-            reason:
-              type: string
           required:
-            - reason
             - type
 
     StatusUpdateInfo:
       allOf:
         - $ref: '#/components/schemas/BaseInfo'
         - type: object
           properties:
-            type:
-              const: status_update
             event:
               $ref: '#/components/schemas/StatusUpdateInfoEvent'
+            type:
+              const: status_update
           required:
             - event
             - type
@@ -608,10 +607,10 @@ components:
         - $ref: '#/components/schemas/BaseInfo'
         - type: object
           properties:
-            type:
-              const: conversation_duration_limit
             conversation_duration_limit:
               type: integer
+            type:
+              const: conversation_duration_limit
           required:
             - conversation_duration_limit
             - type
@@ -621,53 +620,58 @@ components:
         - $ref: '#/components/schemas/BaseInfo'
         - type: object
           properties:
-            type:
-              const: concurrent_session_usage
             usage:
               type: integer
             quota:
               type: integer
             last_udpated:
               type: string
               format: date-time
+            type:
+              const: concurrent_session_usage
           required:
             - usage
             - quota
             - last_updated
             - type
 
-    Warning:
+    WarningMessage:
       oneOf:
-        - $ref: "#/components/schemas/DefaultWarning"
-        - $ref: "#/components/schemas/ConversationTermination"
-      discrimator:
-        propertyName: type
-        mapping:
-          conversation_termination: "#/components/schemas/ConversationTermination"
+        - $ref: "#/components/schemas/Warning"
+        - $ref: "#/components/schemas/ConversationTerminationWarning"
 
-    DefaultWarning:
-      type: object
+    BaseWarning:
       properties:
-        message:
-          const: Warning
-        type:
-          $ref: "#/components/schemas/WarningTypeEnum"
         reason:
           type: string
+        message:
+          const: Warning
       required:
-        - message
-        - type
         - reason
+        - message
+
+    Warning:
+      allOf:
+        - $ref: "#/components/schemas/BaseWarning"
+        - type: object
+          properties:
+            type:
+              $ref: "#/components/schemas/WarningTypeEnum"
+          required:
+            - type
 
-    ConversationTermination:
+    ConversationTerminationWarning:
       allOf:
-        - $ref: "#/components/schemas/DefaultWarning"
+        - $ref: "#/components/schemas/BaseWarning"
         - type: object
           properties:
             conversation_termination:
               type: integer
+            type:
+              const: conversation_termination
           required:
-           - conversation_termination
+          - conversation_termination
+          - type
 
     Error:
       type: object