From 0f81a74f690e06b2747dfb242d46bbbb464acbc5 Mon Sep 17 00:00:00 2001 From: box-sdk-build Date: Thu, 2 Oct 2025 07:18:57 -0700 Subject: [PATCH 1/2] ci: Update auto-update job (box/box-codegen#855) --- .codegen.json | 2 +- .github/workflows/autoupdate-pr.yml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.codegen.json b/.codegen.json index 43216ed21..f7af01094 100644 --- a/.codegen.json +++ b/.codegen.json @@ -1 +1 @@ -{ "engineHash": "52d5b2e", "specHash": "1ed059a", "version": "10.0.0" } +{ "engineHash": "504b5a7", "specHash": "1ed059a", "version": "10.0.0" } diff --git a/.github/workflows/autoupdate-pr.yml b/.github/workflows/autoupdate-pr.yml index bbf7ad303..0540ae82a 100644 --- a/.github/workflows/autoupdate-pr.yml +++ b/.github/workflows/autoupdate-pr.yml @@ -2,7 +2,9 @@ name: Autoupdate PR on: push: branches: + - main - sdk-gen + - combined-sdk jobs: update_pull_requests: @@ -24,10 +26,10 @@ jobs: - name: Auto update pull requests run: | - PR_LIST=$(curl -s -H "Authorization: Bearer ${{ secrets.DISPATCH_ACCESS_TOKEN }}" "https://api.github.com/repos/$GITHUB_REPOSITORY/pulls?state=open" | jq -r '.[] | .head.ref') + PR_LIST=$(curl -s -H "Authorization: Bearer ${{ secrets.DISPATCH_ACCESS_TOKEN }}" "https://api.github.com/repos/$GITHUB_REPOSITORY/pulls?state=open&head=${{ github.ref_name }}" | jq -r '.[] | .head.ref') for pr_branch in $PR_LIST; do git checkout "$pr_branch" - if git merge origin/sdk-gen; then + if git merge origin/${{ github.ref_name }}; then git push else # Conflict occurred, resolve by keeping our changes From 7092957b09d76427d44a8fa598033e15d466975e Mon Sep 17 00:00:00 2001 From: box-sdk-build Date: Thu, 2 Oct 2025 07:37:41 -0700 Subject: [PATCH 2/2] fix: Mark fields in `AiExtractResponse` and `Event` with additionalProperties (box/box-openapi#556) --- .codegen.json | 2 +- box_sdk_gen/schemas/__init__.py | 2 -- box_sdk_gen/schemas/ai_extract_response.py | 8 -------- .../schemas/ai_extract_structured_response.py | 6 +++--- box_sdk_gen/schemas/event.py | 15 ++++++--------- 5 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 box_sdk_gen/schemas/ai_extract_response.py diff --git a/.codegen.json b/.codegen.json index f7af01094..57aae7499 100644 --- a/.codegen.json +++ b/.codegen.json @@ -1 +1 @@ -{ "engineHash": "504b5a7", "specHash": "1ed059a", "version": "10.0.0" } +{ "engineHash": "504b5a7", "specHash": "62fdfd1", "version": "10.0.0" } diff --git a/box_sdk_gen/schemas/__init__.py b/box_sdk_gen/schemas/__init__.py index ca1144376..1306426d7 100644 --- a/box_sdk_gen/schemas/__init__.py +++ b/box_sdk_gen/schemas/__init__.py @@ -10,8 +10,6 @@ from box_sdk_gen.schemas.ai_dialogue_history import * -from box_sdk_gen.schemas.ai_extract_response import * - from box_sdk_gen.schemas.ai_extract_structured_response import * from box_sdk_gen.schemas.ai_item_base import * diff --git a/box_sdk_gen/schemas/ai_extract_response.py b/box_sdk_gen/schemas/ai_extract_response.py deleted file mode 100644 index e18207b35..000000000 --- a/box_sdk_gen/schemas/ai_extract_response.py +++ /dev/null @@ -1,8 +0,0 @@ -from box_sdk_gen.internal.base_object import BaseObject - -from box_sdk_gen.box.errors import BoxSDKError - - -class AiExtractResponse(BaseObject): - def __init__(self, **kwargs): - super().__init__(**kwargs) diff --git a/box_sdk_gen/schemas/ai_extract_structured_response.py b/box_sdk_gen/schemas/ai_extract_structured_response.py index 9c9e7f3ed..76ae79525 100644 --- a/box_sdk_gen/schemas/ai_extract_structured_response.py +++ b/box_sdk_gen/schemas/ai_extract_structured_response.py @@ -1,9 +1,9 @@ +from typing import Dict + from typing import Optional from box_sdk_gen.internal.base_object import BaseObject -from box_sdk_gen.schemas.ai_extract_response import AiExtractResponse - from box_sdk_gen.schemas.ai_agent_info import AiAgentInfo from box_sdk_gen.box.errors import BoxSDKError @@ -14,7 +14,7 @@ class AiExtractStructuredResponse(BaseObject): def __init__( self, - answer: AiExtractResponse, + answer: Dict, created_at: DateTime, *, completion_reason: Optional[str] = None, diff --git a/box_sdk_gen/schemas/event.py b/box_sdk_gen/schemas/event.py index eccdf7582..56ac2b68e 100644 --- a/box_sdk_gen/schemas/event.py +++ b/box_sdk_gen/schemas/event.py @@ -1,9 +1,11 @@ from enum import Enum -from box_sdk_gen.internal.base_object import BaseObject - from typing import Optional +from typing import Dict + +from box_sdk_gen.internal.base_object import BaseObject + from box_sdk_gen.schemas.user import User from box_sdk_gen.schemas.event_source import EventSource @@ -185,11 +187,6 @@ class EventEventTypeField(str, Enum): WATERMARK_LABEL_DELETE = 'WATERMARK_LABEL_DELETE' -class EventAdditionalDetailsField(BaseObject): - def __init__(self, **kwargs): - super().__init__(**kwargs) - - class Event(BaseObject): def __init__( self, @@ -202,7 +199,7 @@ def __init__( event_type: Optional[EventEventTypeField] = None, session_id: Optional[str] = None, source: Optional[EventSourceResource] = None, - additional_details: Optional[EventAdditionalDetailsField] = None, + additional_details: Optional[Dict] = None, **kwargs ): """ @@ -223,7 +220,7 @@ def __init__( information to correlate an event to external KeySafe logs. Not all events have an `additional_details` object. This object is only available in the Enterprise Events., defaults to None - :type additional_details: Optional[EventAdditionalDetailsField], optional + :type additional_details: Optional[Dict], optional """ super().__init__(**kwargs) self.type = type