Skip to content

[agentserver] Clean response models for TypedDict contracts #47992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Shivakishore14 wants to merge 1 commit into
base: sshiva/openai-typeddict-extension
Choose a base branch
from
Draft

[agentserver] Clean response models for TypedDict contracts #47992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 8 additions & 56 deletions sdk/agentserver/azure-ai-agentserver-responses/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ ROOT_SCHEMAS ?= CreateResponse
OVERLAY ?= _scripts/validation-overlay.yaml
TEMP_OUTPUT_DIR := $(OUTPUT_DIR)/.tmp_codegen
MODEL_PACKAGE_DIR := $(TEMP_OUTPUT_DIR)/azure/ai/agentserver/responses/models
MODEL_SHIMS_DIR := _scripts/generated_shims
CONTRACTS_DIR := $(TEMP_TSP_DIR)/sdk-service-agentserver-contracts
MODEL_BASE := $(OUTPUT_DIR)/sdk/models/_utils/model_base.py
SDK_ROOT ?= ../../..
EXTENSION_OPENAI_DIR ?= $(SDK_ROOT)/sdk/ai/azure-ai-extensions-openai

.PHONY: generate-models generate-validators generate-openapi generate-contracts clean install-typespec-deps

Expand Down Expand Up @@ -95,69 +95,21 @@ generate-contracts: generate-models generate-openapi generate-validators
ifeq ($(OS),Windows_NT)
generate-models:
@where tsp-client >NUL 2>NUL || (echo Error: tsp-client is not installed. 1>&2 && echo Run 'make install-typespec-deps' to install it. 1>&2 && exit /b 1)
@where npm >NUL 2>NUL || (echo Error: npm is required. Install Node.js ^(v18+^) from https://nodejs.org/ 1>&2 && exit /b 1)
@echo Syncing upstream TypeSpec sources...
cd /d $(TYPESPEC_DIR) && tsp-client sync
@echo Installing TypeSpec dependencies from emitter-package.json...
cd /d $(TEMP_TSP_DIR) && npm install --silent
@echo Generating Python models...
@echo Generating extension-owned OpenAI Responses models...
cd /d $(EXTENSION_OPENAI_DIR) && $(MAKE) generate-responses-models
@if exist "$(OUTPUT_DIR)" rmdir /s /q "$(OUTPUT_DIR)"
cd /d $(TEMP_TSP_DIR) && npx tsp compile sdk-service-agentserver-contracts\client.tsp --emit @azure-tools/typespec-python --option "@azure-tools/typespec-python.emitter-output-dir=$(abspath $(TEMP_OUTPUT_DIR))"
@if not exist "$(MODEL_PACKAGE_DIR)" (echo Error: generated model package was not found. 1>&2 && exit /b 1)
@if not exist "$(OUTPUT_DIR)\sdk" mkdir "$(OUTPUT_DIR)\sdk"
@xcopy /E /I /Y "$(MODEL_PACKAGE_DIR)" "$(OUTPUT_DIR)\sdk\models" >NUL
@if exist "$(OUTPUT_DIR)\sdk\models\aio" rmdir /s /q "$(OUTPUT_DIR)\sdk\models\aio"
@if exist "$(OUTPUT_DIR)\sdk\models\operations" rmdir /s /q "$(OUTPUT_DIR)\sdk\models\operations"
@if exist "$(OUTPUT_DIR)\sdk\models\_client.py" del /q "$(OUTPUT_DIR)\sdk\models\_client.py"
@if exist "$(OUTPUT_DIR)\sdk\models\_configuration.py" del /q "$(OUTPUT_DIR)\sdk\models\_configuration.py"
@if exist "$(OUTPUT_DIR)\sdk\models\_version.py" del /q "$(OUTPUT_DIR)\sdk\models\_version.py"
@copy /Y "$(MODEL_SHIMS_DIR)\sdk_models__init__.py" "$(OUTPUT_DIR)\sdk\models\__init__.py" >NUL
@copy /Y "$(MODEL_SHIMS_DIR)\__init__.py" "$(OUTPUT_DIR)\__init__.py" >NUL
@copy /Y "$(MODEL_SHIMS_DIR)\_enums.py" "$(OUTPUT_DIR)\_enums.py" >NUL
@copy /Y "$(MODEL_SHIMS_DIR)\_models.py" "$(OUTPUT_DIR)\_models.py" >NUL
@copy /Y "$(MODEL_SHIMS_DIR)\_patch.py" "$(OUTPUT_DIR)\_patch.py" >NUL
@copy /Y "$(MODEL_SHIMS_DIR)\models_patch.py" "$(OUTPUT_DIR)\sdk\models\models\_patch.py" >NUL
@REM Patch _deserialize_sequence: reject plain strings so union falls through to str branch
@powershell -Command "(Get-Content '$(MODEL_BASE)') -replace 'return type\(obj\)\(_deserialize\(deserializer, entry, module\) for entry in obj\)','if isinstance(obj, str):\n raise DeserializationError()\n return type(obj)(_deserialize(deserializer, entry, module) for entry in obj)' | Set-Content '$(MODEL_BASE)'"
@if exist "$(TEMP_OUTPUT_DIR)" rmdir /s /q "$(TEMP_OUTPUT_DIR)"
python _scripts\write_extension_model_shims.py --local-generated-root "$(OUTPUT_DIR)"
else
generate-models:
@command -v tsp-client >/dev/null 2>&1 || { \
echo "Error: tsp-client is not installed." >&2; \
echo "Run 'make install-typespec-deps' to install it." >&2; \
exit 1; \
}
@command -v npm >/dev/null 2>&1 || { \
echo "Error: npm is required. Install Node.js (v18+) from https://nodejs.org/" >&2; \
exit 1; \
}
@echo "Syncing upstream TypeSpec sources..."
cd $(TYPESPEC_DIR) && tsp-client sync
@echo "Installing TypeSpec dependencies from emitter-package.json..."
cd $(TEMP_TSP_DIR) && npm install --silent
@echo "Generating Python models..."
@echo "Generating extension-owned OpenAI Responses models..."
$(MAKE) -C $(EXTENSION_OPENAI_DIR) generate-responses-models
rm -rf $(OUTPUT_DIR)
cd $(TEMP_TSP_DIR) && npx tsp compile sdk-service-agentserver-contracts/client.tsp --emit @azure-tools/typespec-python --option "@azure-tools/typespec-python.emitter-output-dir=$(abspath $(TEMP_OUTPUT_DIR))"
@test -d $(MODEL_PACKAGE_DIR) || { \
echo "Error: generated model package was not found." >&2; \
exit 1; \
}
mkdir -p $(OUTPUT_DIR)/sdk
cp -R $(MODEL_PACKAGE_DIR) $(OUTPUT_DIR)/sdk/models
rm -rf $(OUTPUT_DIR)/sdk/models/aio
rm -rf $(OUTPUT_DIR)/sdk/models/operations
rm -f $(OUTPUT_DIR)/sdk/models/_client.py
rm -f $(OUTPUT_DIR)/sdk/models/_configuration.py
rm -f $(OUTPUT_DIR)/sdk/models/_version.py
cp $(MODEL_SHIMS_DIR)/sdk_models__init__.py $(OUTPUT_DIR)/sdk/models/__init__.py
cp $(MODEL_SHIMS_DIR)/__init__.py $(OUTPUT_DIR)/__init__.py
cp $(MODEL_SHIMS_DIR)/_enums.py $(OUTPUT_DIR)/_enums.py
cp $(MODEL_SHIMS_DIR)/_models.py $(OUTPUT_DIR)/_models.py
cp $(MODEL_SHIMS_DIR)/_patch.py $(OUTPUT_DIR)/_patch.py
cp $(MODEL_SHIMS_DIR)/models_patch.py $(OUTPUT_DIR)/sdk/models/models/_patch.py
# Patch _deserialize_sequence: reject plain strings so union falls through to str branch
sed -i 's/ return type(obj)(_deserialize(deserializer, entry, module) for entry in obj)/ if isinstance(obj, str):\n raise DeserializationError()\n return type(obj)(_deserialize(deserializer, entry, module) for entry in obj)/' $(MODEL_BASE)
rm -rf $(TEMP_OUTPUT_DIR)
python _scripts/write_extension_model_shims.py --local-generated-root "$(OUTPUT_DIR)"
endif

# --------------------------------------------------------------------------
Expand Down
11 changes: 0 additions & 11 deletions sdk/agentserver/azure-ai-agentserver-responses/_scripts/generated_shims/__init__.py
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/agentserver/azure-ai-agentserver-responses/_scripts/generated_shims/_enums.py
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/agentserver/azure-ai-agentserver-responses/_scripts/generated_shims/_models.py
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/agentserver/azure-ai-agentserver-responses/_scripts/generated_shims/_patch.py
View file
Open in desktop

This file was deleted.

225 changes: 0 additions & 225 deletions sdk/agentserver/azure-ai-agentserver-responses/_scripts/generated_shims/models_patch.py
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions ...agentserver/azure-ai-agentserver-responses/_scripts/generated_shims/sdk_models__init__.py
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions sdk/agentserver/azure-ai-agentserver-responses/_scripts/validation-overlay.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ schemas:
Item:
default_discriminator: "message"

# OpenAI input function_call items require type/call_id/name/arguments, but
# not the output-item id assigned by the server.
ItemFunctionToolCall:
not_required: ["id"]

# GAP-03: OpenAI spec InputImageContentParamAutoParam only requires [type].
# The "detail" field is nullable/optional and defaults to "auto".
MessageContentInputImageContent:
Expand Down
Loading