[azopenaiassistants] Updates for 2024-10-01-preview (#23730)

* hash+gen * Adding in MessageAttachmentToolDefinition * Accidental copy/paste * Updating doc comment for MessageAttachmentToolDefinition * Update docindex.yml to use Python 3.11 (#23719) Co-authored-by: Daniel Jurek <djurek@microsoft.com> * Refresh OIDC token in azadmin test resources scripts (#23722) * remove pkg.go.dev link in readme (#23708) * remove pkg.go.dev link in readme * fix changelog * upgrade typesspec-go (#23720) * [azopenai] Inference changes for 2024-10-01-preview (#23672) * update for 1.2.0 release (#23728) * Sync eng/common directory with azure-sdk-tools for PR 9328 (#23692) * ensure that ChangedServices value within the generated pr diff is always properly an array of strings * upload the changed services as an attachment named AdditionalTags in save-package-properties.yml, to allow PipelineWitness to tag public builds during log processing --------- Co-authored-by: Scott Beddall <scbedd@microsoft.com> Co-authored-by: Scott Beddall <45376673+scbedd@users.noreply.github.com> Co-authored-by: Patrick Hallisey <hallipr@gmail.com> * refine typespec release tool (#23735) * Added permissions & resourcetype parameters in listblob response (#23687) * one * Add permissions in ListBlobsIncludeItems * Add permissions in ListBlobsIncludeItems * Appending the value to swagger * Added Owner,Group,Permissions,Acl,ResourceType in ListBlob Response * [Storage] Prep for stg 95 GA release (#23742) * Prep for stg 95 GA release * Update CHANGELOG.md format for changelog * Add SparseCheckoutPaths to archetype-typespec-emitter.yml (#23740) Co-authored-by: Wei Hu <huwe@microsoft.com> * [azopenai] Update azopenai changelog. (#23732) * Fix missing stress matrix display name filter (#23726) Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com> * update date (#23746) * [azopenai] non-existing deployments fail in a different way now. (#23747) * Increment package version after release of ai/azopenai (#23750) * [Release] sdk/resourcemanager/hybridcompute/armhybridcompute/2.1.0-beta.1 generation from spec commit: 63d530d0def1c624f5d42d39170ff4ac196522e2 (#23753) * Increment package version after release of security/keyvault/azadmin (#23749) * Update azopenai* to use hardcoded variable group config (#23748) * Update azopenai* to use hardcoded variable group config * Remove bicep template for ai services * [Release] sdk/resourcemanager/networkcloud/armnetworkcloud/1.2.0-beta.1 generation from spec commit: 4e46346c63935bace7e24f806b4b084f2589d660 (#23757) * Add helpers to log a GitHub "notice" (#23764) Co-authored-by: Mike Harder <mharder@microsoft.com> * Increment package version after release of storage/azdatalake (#23745) * Increment package version after release of storage/azblob (#23744) * Increment package version after release of storage/azfile (#23743) * batching adjustments for create-prjobmatrix (#23773) Co-authored-by: Scott Beddall <scbedd@microsoft.com> * changelog * updated version * Update sdk/ai/azopenaiassistants/CHANGELOG.md Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com> * updated --------- Co-authored-by: ripark <ripark@microsoft.com> Co-authored-by: Richard Park <51494936+richardpark-msft@users.noreply.github.com> Co-authored-by: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Co-authored-by: Daniel Jurek <djurek@microsoft.com> Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com> Co-authored-by: Chenjie Shi <tadelesh.shi@live.cn> Co-authored-by: Ashley Stanton-Nurse <ashleyst@microsoft.com> Co-authored-by: Scott Beddall <scbedd@microsoft.com> Co-authored-by: Scott Beddall <45376673+scbedd@users.noreply.github.com> Co-authored-by: Patrick Hallisey <hallipr@gmail.com> Co-authored-by: ashruti-msft <137055338+ashruti-msft@users.noreply.github.com> Co-authored-by: tanyasethi-msft <124860586+tanyasethi-msft@users.noreply.github.com> Co-authored-by: Wei Hu <huwe@microsoft.com> Co-authored-by: Grace Wilcox <43627800+gracewilcox@users.noreply.github.com> Co-authored-by: Judy Liu <v-liujudy@microsoft.com> Co-authored-by: Mike Harder <mharder@microsoft.com> Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com>
Azure · Dec 3, 2024 · 2ea046b · 2ea046b
1 parent 590fc96
commit 2ea046b
Show file tree

Hide file tree

Showing 11 changed files with 142 additions and 121 deletions.
diff --git a/sdk/ai/azopenaiassistants/CHANGELOG.md b/sdk/ai/azopenaiassistants/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Release History
 
+## 0.3.0 (2024-12-03)
+
+### Features Added
+
+- Added support for the `ParallelToolCalls` option.
+
+### Breaking Changes
+
+- `MessageAttachmentToolAssignment` is now `MessageAttachmentToolDefinition`.
+
 ## 0.2.1 (2024-09-10)
 
 ### Features Added
@@ -23,7 +33,6 @@
 ### Bugs Fixed
 
 - ThreadRun.RequiredAction was deserialized incorrectly, making it impossible to actually resubmit a tool output. (PR#22834)
-
 ## 0.1.0 (2024-03-05)
 
 * Initial release of the `azopenaiassistants` library
diff --git a/sdk/ai/azopenaiassistants/autorest.md b/sdk/ai/azopenaiassistants/autorest.md
@@ -155,6 +155,22 @@ directive:
       return $;
 ```
 
+MessageAttachmentToolDefinition
+
+```yaml
+directive:
+  - from: swagger-document
+    where: $.definitions
+    transform: |
+      // create the dummy type that I can use to point to my manually created union
+      $.MessageAttachmentToolDefinition = {
+        "x-ms-external": true,
+        "type": "object",
+        "properties": { "ignored": { "type": "string" } },
+        "x-ms-client-name": "MessageAttachmentToolDefinition"
+      };
+```
+
 ## Model -> DeploymentName
 
 ```yaml

diff --git a/sdk/ai/azopenaiassistants/client.go b/sdk/ai/azopenaiassistants/client.go
diff --git a/sdk/ai/azopenaiassistants/client_test.go b/sdk/ai/azopenaiassistants/client_test.go
@@ -157,9 +157,9 @@ func TestAssistantMessages(t *testing.T) {
 			Attachments: []azopenaiassistants.MessageAttachment{
 				{
 					FileID: uploadResp.ID,
-					Tools: []azopenaiassistants.MessageAttachmentToolAssignment{
-						{Type: to.Ptr(azopenaiassistants.MessageAttachmentToolAssignmentTypeCodeInterpreter)},
-						{Type: to.Ptr(azopenaiassistants.MessageAttachmentToolAssignmentTypeFileSearch)},
+					Tools: []azopenaiassistants.MessageAttachmentToolDefinition{
+						{CodeInterpreterToolDefinition: &azopenaiassistants.CodeInterpreterToolDefinition{}},
+						{FileSearchToolDefinition: &azopenaiassistants.FileSearchToolDefinition{}},
 					},
 				},
 			},
@@ -169,17 +169,12 @@ func TestAssistantMessages(t *testing.T) {
 		attachmentTools := messageResp.Attachments[0].Tools
 
 		// just trying to keep a consistent ordering of the tools for our checks.
-		if *attachmentTools[0].Type == azopenaiassistants.MessageAttachmentToolAssignmentTypeFileSearch {
+		if attachmentTools[0].FileSearchToolDefinition != nil {
 			attachmentTools[0], attachmentTools[1] = attachmentTools[1], attachmentTools[0]
 		}
 
-		require.Equal(t, azopenaiassistants.MessageAttachmentToolAssignment{
-			Type: to.Ptr(azopenaiassistants.MessageAttachmentToolAssignmentType("code_interpreter")),
-		}, attachmentTools[0])
-
-		require.Equal(t, azopenaiassistants.MessageAttachmentToolAssignment{
-			Type: to.Ptr(azopenaiassistants.MessageAttachmentToolAssignmentType("file_search")),
-		}, attachmentTools[1])
+		require.NotNil(t, attachmentTools[0].CodeInterpreterToolDefinition)
+		require.NotNil(t, attachmentTools[1].FileSearchToolDefinition)
 
 		messageID := messageResp.ID
 

diff --git a/sdk/ai/azopenaiassistants/constants.go b/sdk/ai/azopenaiassistants/constants.go
diff --git a/sdk/ai/azopenaiassistants/internal/transform/transform.go b/sdk/ai/azopenaiassistants/internal/transform/transform.go
@@ -266,24 +266,8 @@ func (t *transformer) replaceDocs() error {
 	log.Printf("replaceDocs()")
 
 	err := transformFiles(t.fileCache, "replaceDocs", []string{"client.go"}, func(text string) (string, error) {
-		docString := `
-// CreateVectorStoreFile - Create a vector store file by attaching a file to a vector store.
-// If the operation fails it returns an *azcore.ResponseError type.
-//
-// Generated from API version 2024-07-01-preview
-//   - vectorStoreID - The ID of the vector store for which to create a File.
-//   - options - CreateVectorStoreFileOptions contains the optional parameters for the Client.CreateVectorStoreFile method.
-`
-		newDocString := `
-// CreateVectorStoreFile - Create a vector store file by attaching a file to a vector store.
-// If the operation fails it returns an *azcore.ResponseError type.
-//
-// Generated from API version 2024-07-01-preview
-//   - vectorStoreID - The ID of the vector store for which to create a File.
-//   - body - Request object for creating a vector store file.
-//   - options - CreateVectorStoreFileOptions contains the optional parameters for the Client.CreateVectorStoreFile method.
-`
-		text = strings.ReplaceAll(text, docString, newDocString)
+		docStringRE := regexp.MustCompile(`(?s)(- options - CreateVectorStoreFileOptions)`)
+		text = docStringRE.ReplaceAllString(text, "  - body - Request object for creating a vector store file.\n"+`//  $1`)
 		return text, nil
 	}, nil)
 	return err

diff --git a/sdk/ai/azopenaiassistants/models.go b/sdk/ai/azopenaiassistants/models.go
diff --git a/sdk/ai/azopenaiassistants/models_custom.go b/sdk/ai/azopenaiassistants/models_custom.go
@@ -5,6 +5,7 @@ package azopenaiassistants
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 )
 
@@ -151,3 +152,47 @@ func unmarshalStringOrObject[T any](jsonBytes []byte) (string, *T, error) {
 
 	return "", model, nil
 }
+
+// MessageAttachmentToolDefinition allows you to specify tools for use with a message attachment.
+type MessageAttachmentToolDefinition struct {
+	*CodeInterpreterToolDefinition
+	*FileSearchToolDefinition
+}
+
+// MarshalJSON implements the json.Marshaller interface for type MessageAttachmentToolDefinition.
+func (m MessageAttachmentToolDefinition) MarshalJSON() ([]byte, error) {
+	if m.CodeInterpreterToolDefinition != nil && m.FileSearchToolDefinition != nil {
+		return nil, errors.New("only one tool definition should be set in MessageAttachmentToolDefinition")
+	}
+
+	switch {
+	case m.CodeInterpreterToolDefinition != nil:
+		return json.Marshal(m.CodeInterpreterToolDefinition)
+	case m.FileSearchToolDefinition != nil:
+		return json.Marshal(m.FileSearchToolDefinition)
+	default:
+		return nil, errors.New("no tool definition was set in MessageAttachmentToolDefinition")
+	}
+}
+
+// UnmarshalJSON implements the json.Marshaller interface for type MessageAttachmentToolDefinition.
+func (m *MessageAttachmentToolDefinition) UnmarshalJSON(data []byte) error {
+	// There's only two types right now (CodeInterpreterToolDefinition and FileSearchToolDefinition)
+	// and CodeInterpreterToolDefinition is a subset of FileSearchToolDefinition
+	var toolDef *FileSearchToolDefinition
+
+	if err := json.Unmarshal(data, &toolDef); err != nil {
+		return err
+	}
+
+	switch *toolDef.Type {
+	case "code_interpreter":
+		m.CodeInterpreterToolDefinition = &CodeInterpreterToolDefinition{Type: toolDef.Type}
+		return nil
+	case "file_search":
+		m.FileSearchToolDefinition = toolDef
+		return nil
+	default:
+		return fmt.Errorf("unhandled tool definition type %s", *toolDef.Type)
+	}
+}
diff --git a/sdk/ai/azopenaiassistants/models_serde.go b/sdk/ai/azopenaiassistants/models_serde.go
diff --git a/sdk/ai/azopenaiassistants/testdata/tsp-location.yaml b/sdk/ai/azopenaiassistants/testdata/tsp-location.yaml
@@ -1,5 +1,5 @@
 #location: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/cacb3dc095486d8691c47dea944fc9ed0f4d0e32/specification/ai/OpenAI.Assistants/client.tsp
 directory: specification/ai/OpenAI.Assistants
 # https://github.com/Azure/azure-rest-api-specs/pull/29067
-commit: eb46d197d57e1f71f1819f37779f387f20c344e9
+commit: ea5bac870d87ff0424a4e4f5c448b0a66890838d
 repo: Azure/azure-rest-api-specs
diff --git a/sdk/ai/azopenaiassistants/version.go b/sdk/ai/azopenaiassistants/version.go
@@ -7,5 +7,5 @@
 package azopenaiassistants
 
 const (
-	version = "v0.2.1"
+	version = "v0.3.0"
 )