Reorganizes client TypeSpec files for better structure and consistency (#43945)

dargilco · web-flow · commit e67cdc6ec1f5 · 2026-06-15T06:59:28.000-07:00
diff --git a/specification/ai-foundry/data-plane/Foundry/main.tsp b/specification/ai-foundry/data-plane/Foundry/main.tsp
@@ -30,4 +30,4 @@ import "./src/toolboxes/routes.tsp";
 import "./src/data_generation_jobs/routes.tsp";
 import "./src/agents-optimization/routes.tsp";
 import "./tag-definitions.tsp";
-import "./src/error.range.tsp";
+import "./src/common/error.range.tsp";
diff --git a/specification/ai-foundry/data-plane/Foundry/src/agents-containers/routes.tsp b/specification/ai-foundry/data-plane/Foundry/src/agents-containers/routes.tsp
@@ -1,5 +1,5 @@
 import "../common/models.tsp";
-import "../servicepatterns.tsp";
+import "../common/servicepatterns.tsp";
 import "./models.tsp";
 
 using TypeSpec.Http;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/agents-optimization/models.tsp b/specification/ai-foundry/data-plane/Foundry/src/agents-optimization/models.tsp
@@ -8,8 +8,8 @@
 //   ApiError — standard error shape
 
 import "../common/models.tsp";
+import "../common/servicepatterns.tsp";
 import "../openai-evaluations/models.tsp";
-import "../servicepatterns.tsp";
 
 using TypeSpec.Rest;
 
diff --git a/specification/ai-foundry/data-plane/Foundry/src/agents-session-files/routes.tsp b/specification/ai-foundry/data-plane/Foundry/src/agents-session-files/routes.tsp
@@ -1,6 +1,6 @@
 import "../common/models.tsp";
+import "../common/servicepatterns.tsp";
 import "./models.tsp";
-import "../servicepatterns.tsp";
 
 using TypeSpec.Http;
 using TypeSpec.OpenAPI;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/agents/models.tsp b/specification/ai-foundry/data-plane/Foundry/src/agents/models.tsp
@@ -1,5 +1,5 @@
 import "../openai-responses/models.tsp";
-import "../servicepatterns.tsp";
+import "../common/servicepatterns.tsp";
 
 using TypeSpec.Http;
 using TypeSpec.OpenAPI;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/common/error.range.tsp b/specification/ai-foundry/data-plane/Foundry/src/common/error.range.tsp
diff --git a/specification/ai-foundry/data-plane/Foundry/src/common/servicepatterns.tsp b/specification/ai-foundry/data-plane/Foundry/src/common/servicepatterns.tsp
diff --git a/specification/ai-foundry/data-plane/Foundry/src/data_generation_jobs/models.tsp b/specification/ai-foundry/data-plane/Foundry/src/data_generation_jobs/models.tsp
@@ -1,5 +1,5 @@
 import "../common/models.tsp";
-import "../servicepatterns.tsp";
+import "../common/servicepatterns.tsp";
 
 namespace Azure.AI.Projects;
 
diff --git a/specification/ai-foundry/data-plane/Foundry/src/datasets/routes.tsp b/specification/ai-foundry/data-plane/Foundry/src/datasets/routes.tsp
@@ -1,5 +1,5 @@
 import "../common/models.tsp";
-import "../servicepatterns.tsp";
+import "../common/servicepatterns.tsp";
 import "./models.tsp";
 
 using TypeSpec.Http;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/evaluation-rules/routes.tsp b/specification/ai-foundry/data-plane/Foundry/src/evaluation-rules/routes.tsp
@@ -1,5 +1,5 @@
 import "../common/models.tsp";
-import "../servicepatterns.tsp";
+import "../common/servicepatterns.tsp";
 import "./models.tsp";
 
 using TypeSpec.Http;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/evaluation-suites/models.tsp b/specification/ai-foundry/data-plane/Foundry/src/evaluation-suites/models.tsp
@@ -1,7 +1,7 @@
 import "@typespec/openapi";
 
 import "../common/models.tsp";
-import "../servicepatterns.tsp";
+import "../common/servicepatterns.tsp";
 import "../openai-evaluations/models.tsp";
 
 using TypeSpec.Rest;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/evaluation-suites/routes.tsp b/specification/ai-foundry/data-plane/Foundry/src/evaluation-suites/routes.tsp
@@ -1,5 +1,5 @@
 import "../common/models.tsp";
-import "../servicepatterns.tsp";
+import "../common/servicepatterns.tsp";
 import "./models.tsp";
 
 namespace Azure.AI.Projects;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/evaluators/models.tsp b/specification/ai-foundry/data-plane/Foundry/src/evaluators/models.tsp
@@ -2,7 +2,7 @@ import "@typespec/openapi";
 import "@typespec/versioning";
 
 import "../common/models.tsp";
-import "../servicepatterns.tsp";
+import "../common/servicepatterns.tsp";
 
 using TypeSpec.Rest;
 using TypeSpec.Versioning;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/evaluators/routes.tsp b/specification/ai-foundry/data-plane/Foundry/src/evaluators/routes.tsp
@@ -1,5 +1,5 @@
 import "../common/models.tsp";
-import "../servicepatterns.tsp";
+import "../common/servicepatterns.tsp";
 import "./models.tsp";
 
 namespace Azure.AI.Projects;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/indexes/routes.tsp b/specification/ai-foundry/data-plane/Foundry/src/indexes/routes.tsp
@@ -1,5 +1,5 @@
 import "./models.tsp";
-import "../servicepatterns.tsp";
+import "../common/servicepatterns.tsp";
 import "../common/models.tsp";
 
 using TypeSpec.Versioning;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/memory-stores/routes.tsp b/specification/ai-foundry/data-plane/Foundry/src/memory-stores/routes.tsp
@@ -1,5 +1,5 @@
 import "../common/models.tsp";
-import "../servicepatterns.tsp";
+import "../common/servicepatterns.tsp";
 import "./models.tsp";
 
 using TypeSpec.Http;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/models/routes.tsp b/specification/ai-foundry/data-plane/Foundry/src/models/routes.tsp
@@ -1,5 +1,5 @@
 import "./models.tsp";
-import "../servicepatterns.tsp";
+import "../common/servicepatterns.tsp";
 import "../common/models.tsp";
 
 using TypeSpec.Http;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/routines/models.tsp b/specification/ai-foundry/data-plane/Foundry/src/routines/models.tsp
@@ -1,5 +1,5 @@
 import "../common/models.tsp";
-import "../servicepatterns.tsp";
+import "../common/servicepatterns.tsp";
 
 using TypeSpec.Http;
 using TypeSpec.OpenAPI;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/routines/routes.tsp b/specification/ai-foundry/data-plane/Foundry/src/routines/routes.tsp
@@ -1,5 +1,5 @@
 import "../common/models.tsp";
-import "../servicepatterns.tsp";
+import "../common/servicepatterns.tsp";
 import "./models.tsp";
 
 using TypeSpec.Http;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/sdk-common/error.default.tsp b/specification/ai-foundry/data-plane/Foundry/src/sdk-common/error.default.tsp
diff --git a/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-agent-contracts/client.tsp b/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-agent-contracts/client.tsp
@@ -1,4 +1,15 @@
-import "./main.tsp";
+import "../sdk-common/error.default.tsp";
+import "../common/servicepatterns.tsp";
+import "../common/models.tsp";
+import "../common/service.tsp";
+import "../agents/routes.tsp";
+import "../agents-containers/routes.tsp";
+import "../agents-invocations_ws/routes.tsp";
+import "../memory-stores/routes.tsp";
+import "../skills/routes.tsp";
+import "../openai-conversations/routes.tsp";
+import "../openai-responses/routes.tsp";
+import "../toolboxes/routes.tsp";
 
 using Azure.ClientGenerator.Core;
 using Azure.Core.Experimental;
@@ -251,6 +262,7 @@ namespace Azure.AI.Projects {
   @@access(UpdateAgentRequest, Access.public);
   @@usage(UpdateAgentRequest, Usage.input);
 
-  @@access(OpenAI.OutputItemCustomToolCallOutput, Access.public);
-  @@usage(OpenAI.OutputItemCustomToolCallOutput, Usage.input | Usage.output);
+  @@access(OpenAI.ItemCustomToolCallOutput, Access.public);
+  @@usage(OpenAI.ItemCustomToolCallOutput, Usage.input | Usage.output);
+  @@clientName(OpenAI.ItemCustomToolCallOutput, "OutputItemCustomToolCallOutput");
 }
diff --git a/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-agent-contracts/main.tsp b/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-agent-contracts/main.tsp
diff --git a/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-agent-contracts/tspconfig.yaml b/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-agent-contracts/tspconfig.yaml
@@ -1,5 +1,4 @@
 emit:
-  - "@typespec/http-client-csharp"
 options:
   "@typespec/http-client-csharp":
     emitter-output-dir: "{output-dir}"
@@ -16,7 +15,6 @@ options:
       - specification/ai-foundry/data-plane/Foundry/src/openai-conversations
       - specification/ai-foundry/data-plane/Foundry/src/openai-responses
       - specification/ai-foundry/data-plane/Foundry/src/toolboxes
-      - specification/ai-foundry/data-plane/Foundry/src/servicepatterns.tsp
 imports:
   - "@azure-tools/typespec-azure-core"
   - "@azure-tools/typespec-azure-core/experimental"
diff --git a/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-extensions-openai/client.tsp b/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-extensions-openai/client.tsp
@@ -1,4 +1,7 @@
-import "./main.tsp";
+import "../sdk-common/error.default.tsp";
+import "../common/servicepatterns.tsp";
+import "../openai-conversations/routes.tsp";
+import "../openai-responses/routes.tsp";
 
 using Azure.ClientGenerator.Core;
 using Azure.Core.Experimental;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-extensions-openai/main.tsp b/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-extensions-openai/main.tsp
diff --git a/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-extensions-openai/tspconfig.yaml b/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-extensions-openai/tspconfig.yaml
@@ -17,8 +17,6 @@ options:
       - specification/ai-foundry/data-plane/Foundry/src/openai-conversations
       - specification/ai-foundry/data-plane/Foundry/src/openai-responses
       - specification/ai-foundry/data-plane/Foundry/src/tools
-      - specification/ai-foundry/data-plane/Foundry/src/servicepatterns.tsp
-      - specification/ai-foundry/data-plane/Foundry/src/error.range.tsp
 imports:
   - "@azure-tools/typespec-azure-core"
   - "@azure-tools/typespec-azure-core/experimental"
diff --git a/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-projects-agents/client.tsp b/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-projects-agents/client.tsp
@@ -1,4 +1,10 @@
-import "./main.tsp";
+import "../sdk-common/error.default.tsp";
+import "../agents/routes.tsp";
+import "../toolboxes/routes.tsp";
+import "../skills/routes.tsp";
+import "../agents-session-files/routes.tsp";
+import "../managed-blueprints/routes.tsp";
+import "../agents-optimization/routes.tsp";
 
 using Azure.ClientGenerator.Core;
 using Azure.Core.Experimental;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-projects-agents/main.tsp b/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-projects-agents/main.tsp
diff --git a/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-projects-agents/tspconfig.yaml b/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-projects-agents/tspconfig.yaml
@@ -24,8 +24,6 @@ options:
       - specification/ai-foundry/data-plane/Foundry/src/agents-session-files
       - specification/ai-foundry/data-plane/Foundry/src/managed-blueprints
       - specification/ai-foundry/data-plane/Foundry/src/agents-optimization
-      - specification/ai-foundry/data-plane/Foundry/src/servicepatterns.tsp
-      - specification/ai-foundry/data-plane/Foundry/src/error.range.tsp
 imports:
   - "@azure-tools/typespec-azure-core"
   - "@azure-tools/typespec-azure-core/experimental"
diff --git a/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-projects/client.tsp b/specification/ai-foundry/data-plane/Foundry/src/sdk-csharp-azure-ai-projects/client.tsp
@@ -1,4 +1,5 @@
 import "../common/service.tsp";
+import "../sdk-common/error.default.tsp";
 import "../connections/routes.tsp";
 import "../datasets/routes.tsp";
 import "../indexes/routes.tsp";
@@ -13,7 +14,6 @@ import "../schedules/routes.tsp";
 import "../memory-stores/routes.tsp";
 import "../routines/routes.tsp";
 import "../data_generation_jobs/routes.tsp";
-import "../error.range.tsp";
 
 using Azure.ClientGenerator.Core;
 namespace Azure.AI.Projects;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/sdk-java-azure-ai-agents/client.tsp b/specification/ai-foundry/data-plane/Foundry/src/sdk-java-azure-ai-agents/client.tsp
@@ -1,5 +1,6 @@
 import "../common/service.tsp";
 import "../common/custom-types.tsp";
+import "../sdk-common/error.default.tsp";
 import "../sdk-common/beta-ops-relocation-agents.tsp";
 
 import "../agents/routes.tsp";
@@ -100,8 +101,6 @@ using Azure.AI.Projects;
 @@clientName(OptimizationCandidate.eval_id, "evaluationId");
 @@clientName(OptimizationCandidate.eval_run_id, "evaluationRunId");
 
-@@clientName(PromoteCandidateRequest, "PromoteCandidateInput");
-@@clientName(PromoteCandidateResponse, "PromoteCandidateResult");
 @@clientName(SessionFileWriteResponse, "SessionFileWriteResult");
 
 @@clientName(
@@ -196,36 +195,6 @@ using Azure.AI.Projects;
 @@clientName(AgentOptimizationJobs.list, "listOptimizationJobs", "java");
 @@clientName(AgentOptimizationJobs.cancel, "cancelOptimizationJob", "java");
 @@clientName(AgentOptimizationJobs.delete, "deleteOptimizationJob", "java");
-@@clientName(
-  AgentOptimizationJobs.listCandidates,
-  "listOptimizationCandidates",
-  "java"
-);
-@@clientName(
-  AgentOptimizationJobs.getCandidate,
-  "getOptimizationCandidate",
-  "java"
-);
-@@clientName(
-  AgentOptimizationJobs.getCandidateConfig,
-  "getOptimizationCandidateConfig",
-  "java"
-);
-@@clientName(
-  AgentOptimizationJobs.getCandidateResults,
-  "getOptimizationCandidateResults",
-  "java"
-);
-@@clientName(
-  AgentOptimizationJobs.promoteCandidate,
-  "promoteOptimizationCandidate",
-  "java"
-);
-@@clientName(
-  AgentOptimizationJobs.getCandidateFile,
-  "getOptimizationCandidateFile",
-  "java"
-);
 
 // --------------------------------------------------------------------------------
 // Usage / Public accessibility overrides
@@ -694,18 +663,3 @@ union WebSearchToolSearchContextSizeExpandable {
 @@clientName(Conversations.listConversations, "listAgentConversations", "java");
 @@clientLocation(Conversations.listConversations, Agents);
 
-// --------------------------------------------------------------------------------
-// AgentOptimizationJobs: relocate operations onto the Agents sub-client
-// --------------------------------------------------------------------------------
-
-@@clientLocation(AgentOptimizationJobs.create, Agents);
-@@clientLocation(AgentOptimizationJobs.get, Agents);
-@@clientLocation(AgentOptimizationJobs.list, Agents);
-@@clientLocation(AgentOptimizationJobs.cancel, Agents);
-@@clientLocation(AgentOptimizationJobs.delete, Agents);
-@@clientLocation(AgentOptimizationJobs.listCandidates, Agents);
-@@clientLocation(AgentOptimizationJobs.getCandidate, Agents);
-@@clientLocation(AgentOptimizationJobs.getCandidateConfig, Agents);
-@@clientLocation(AgentOptimizationJobs.getCandidateResults, Agents);
-@@clientLocation(AgentOptimizationJobs.promoteCandidate, Agents);
-@@clientLocation(AgentOptimizationJobs.getCandidateFile, Agents);
diff --git a/specification/ai-foundry/data-plane/Foundry/src/sdk-java-azure-ai-agents/tspconfig.yaml b/specification/ai-foundry/data-plane/Foundry/src/sdk-java-azure-ai-agents/tspconfig.yaml
@@ -23,12 +23,6 @@ options:
       AgentsPagedResultOptimizationCandidate: OptimizationCandidatePagedResult
     customization-class: customizations/src/main/java/AgentsCustomizations.java
     flavor: azure
-  "@typespec/json-schema":
-    emitAllModels: true
-    emitAllRefs: false
-    emitter-output-dir: "{output-dir}/{service-dir}/json-schema"
-    file-type: json
-    bundleId: azure-ai-agents-v2.json
   "@azure-tools/typespec-client-generator-cli":
     additionalDirectories:
       - "specification/ai-foundry/data-plane/Foundry/src/.external-readonly/"
diff --git a/specification/ai-foundry/data-plane/Foundry/src/sdk-java-azure-ai-projects/client.tsp b/specification/ai-foundry/data-plane/Foundry/src/sdk-java-azure-ai-projects/client.tsp
@@ -1,4 +1,5 @@
 import "../common/service.tsp";
+import "../sdk-common/error.default.tsp";
 
 import "../connections/routes.tsp";
 import "../datasets/routes.tsp";
diff --git a/specification/ai-foundry/data-plane/Foundry/src/sdk-python-js-azure-ai-projects/client.tsp b/specification/ai-foundry/data-plane/Foundry/src/sdk-python-js-azure-ai-projects/client.tsp
@@ -32,7 +32,7 @@ import "../agents-optimization/routes.tsp";
 // Create a ".beta" subclient for the above beta operations
 import "../sdk-common/beta-ops-relocation-agents.tsp";
 import "../sdk-common/beta-ops-relocation-projects.tsp";
-import "../error.default.tsp";
+import "../sdk-common/error.default.tsp";
 
 using Azure.ClientGenerator.Core;
 using Azure.AI.Projects;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/sdk-python-js-azure-ai-projects/tspconfig.yaml b/specification/ai-foundry/data-plane/Foundry/src/sdk-python-js-azure-ai-projects/tspconfig.yaml
@@ -47,11 +47,9 @@ options:
       - specification/ai-foundry/data-plane/Foundry/src/routines
       - specification/ai-foundry/data-plane/Foundry/src/schedules
       - specification/ai-foundry/data-plane/Foundry/src/sdk-common
-      - specification/ai-foundry/data-plane/Foundry/src/servicepatterns.tsp
       - specification/ai-foundry/data-plane/Foundry/src/skills
       - specification/ai-foundry/data-plane/Foundry/src/toolboxes
       - specification/ai-foundry/data-plane/Foundry/src/tools
-      - specification/ai-foundry/data-plane/Foundry/src/error.default.tsp
 imports:
   - "@azure-tools/typespec-azure-core"
   - "@azure-tools/typespec-azure-core/experimental"
diff --git a/specification/ai-foundry/data-plane/Foundry/src/skills/routes.tsp b/specification/ai-foundry/data-plane/Foundry/src/skills/routes.tsp
@@ -1,5 +1,5 @@
 import "../common/models.tsp";
-import "../servicepatterns.tsp";
+import "../common/servicepatterns.tsp";
 import "./models.tsp";
 
 using TypeSpec.Http;
diff --git a/specification/ai-foundry/data-plane/Foundry/src/toolboxes/routes.tsp b/specification/ai-foundry/data-plane/Foundry/src/toolboxes/routes.tsp
@@ -1,5 +1,5 @@
 import "../common/models.tsp";
-import "../servicepatterns.tsp";
+import "../common/servicepatterns.tsp";
 import "./models.tsp";
 
 using TypeSpec.Http;
