fix(client): fix circular dependencies and offset pagination

Author: stainless-app[bot]

.stats.yml

@@ -1,4 +1,4 @@
 configured_endpoints: 107
 openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/llamastack%2Fllama-stack-client-f252873ea1e1f38fd207331ef2621c511154d5be3f4076e59cc15754fc58eee4.yml
 openapi_spec_hash: 10cbb4337a06a9fdd7d08612dd6044c3
-config_hash: 40b8d777e1eb8b6ab05759b663edd2fb
+config_hash: 374d9711288576877a9fabb34e4da7b9

README.md

@@ -297,9 +297,9 @@ To handle errors, we recommend that you use the `errors.As` pattern:
 
 ```go
 _, err := client.Inference.ChatCompletion(context.TODO(), llamastackclient.InferenceChatCompletionParams{
-	Messages: []shared.MessageUnionParam{{
-		OfUser: &shared.UserMessageParam{
-			Content: shared.InterleavedContentUnionParam{
+	Messages: []llamastackclient.MessageUnionParam{{
+		OfUser: &llamastackclient.UserMessageParam{
+			Content: llamastackclient.InterleavedContentUnionParam{
 				OfString: llamastackclient.String("string"),
 			},
 		},
@@ -333,9 +333,9 @@ defer cancel()
 client.Inference.ChatCompletion(
 	ctx,
 	llamastackclient.InferenceChatCompletionParams{
-		Messages: []shared.MessageUnionParam{{
-			OfUser: &shared.UserMessageParam{
-				Content: shared.InterleavedContentUnionParam{
+		Messages: []llamastackclient.MessageUnionParam{{
+			OfUser: &llamastackclient.UserMessageParam{
+				Content: llamastackclient.InterleavedContentUnionParam{
 					OfString: llamastackclient.String("string"),
 				},
 			},
@@ -399,9 +399,9 @@ client := llamastackclient.NewClient(
 client.Inference.ChatCompletion(
 	context.TODO(),
 	llamastackclient.InferenceChatCompletionParams{
-		Messages: []shared.MessageUnionParam{{
-			OfUser: &shared.UserMessageParam{
-				Content: shared.InterleavedContentUnionParam{
+		Messages: []llamastackclient.MessageUnionParam{{
+			OfUser: &llamastackclient.UserMessageParam{
+				Content: llamastackclient.InterleavedContentUnionParam{
 					OfString: llamastackclient.String("string"),
 				},
 			},
@@ -423,9 +423,9 @@ var response *http.Response
 chatCompletionResponse, err := client.Inference.ChatCompletion(
 	context.TODO(),
 	llamastackclient.InferenceChatCompletionParams{
-		Messages: []shared.MessageUnionParam{{
-			OfUser: &shared.UserMessageParam{
-				Content: shared.InterleavedContentUnionParam{
+		Messages: []llamastackclient.MessageUnionParam{{
+			OfUser: &llamastackclient.UserMessageParam{
+				Content: llamastackclient.InterleavedContentUnionParam{
 					OfString: llamastackclient.String("string"),
 				},
 			},

agent.go

@@ -17,7 +17,6 @@ import (
 	"github.com/llamastack/llama-stack-client-go/option"
 	"github.com/llamastack/llama-stack-client-go/packages/param"
 	"github.com/llamastack/llama-stack-client-go/packages/respjson"
-	"github.com/llamastack/llama-stack-client-go/shared"
 	"github.com/llamastack/llama-stack-client-go/shared/constant"
 )
 
@@ -90,7 +89,7 @@ func (r *AgentService) Delete(ctx context.Context, agentID string, opts ...optio
 // An inference step in an agent turn.
 type InferenceStep struct {
 	// The response from the LLM.
-	ModelResponse shared.CompletionMessage `json:"model_response,required"`
+	ModelResponse CompletionMessage `json:"model_response,required"`
 	// The ID of the step.
 	StepID string `json:"step_id,required"`
 	// Type of the step in an agent turn.
@@ -123,7 +122,7 @@ func (r *InferenceStep) UnmarshalJSON(data []byte) error {
 // A memory retrieval step in an agent turn.
 type MemoryRetrievalStep struct {
 	// The context retrieved from the vector databases.
-	InsertedContext shared.InterleavedContentUnion `json:"inserted_context,required"`
+	InsertedContext InterleavedContentUnion `json:"inserted_context,required"`
 	// The ID of the step.
 	StepID string `json:"step_id,required"`
 	// Type of the step in an agent turn.
@@ -169,7 +168,7 @@ type ShieldCallStep struct {
 	// The time the step started.
 	StartedAt time.Time `json:"started_at" format:"date-time"`
 	// The violation from the shield call.
-	Violation shared.SafetyViolation `json:"violation"`
+	Violation SafetyViolation `json:"violation"`
 	// JSON contains metadata for fields, check presence with [respjson.Field.Valid].
 	JSON struct {
 		StepID      respjson.Field
@@ -196,7 +195,7 @@ type ToolExecutionStep struct {
 	// Type of the step in an agent turn.
 	StepType constant.ToolExecution `json:"step_type,required"`
 	// The tool calls to execute.
-	ToolCalls []shared.ToolCall `json:"tool_calls,required"`
+	ToolCalls []ToolCall `json:"tool_calls,required"`
 	// The tool responses from the tool calls.
 	ToolResponses []ToolResponse `json:"tool_responses,required"`
 	// The ID of the turn.
@@ -230,7 +229,7 @@ type ToolResponse struct {
 	// Unique identifier for the tool call this response is for
 	CallID string `json:"call_id,required"`
 	// The response content from the tool
-	Content shared.InterleavedContentUnion `json:"content,required"`
+	Content InterleavedContentUnion `json:"content,required"`
 	// Name of the tool that was invoked
 	ToolName ToolResponseToolName `json:"tool_name,required"`
 	// (Optional) Additional metadata about the tool response
@@ -330,7 +329,7 @@ type ToolResponseParam struct {
 	// Unique identifier for the tool call this response is for
 	CallID string `json:"call_id,required"`
 	// The response content from the tool
-	Content shared.InterleavedContentUnionParam `json:"content,omitzero,required"`
+	Content InterleavedContentUnionParam `json:"content,omitzero,required"`
 	// Name of the tool that was invoked
 	ToolName ToolResponseToolName `json:"tool_name,omitzero,required"`
 	// (Optional) Additional metadata about the tool response
@@ -398,7 +397,7 @@ func (r *AgentNewResponse) UnmarshalJSON(data []byte) error {
 // An agent instance with configuration and metadata.
 type AgentGetResponse struct {
 	// Configuration settings for the agent
-	AgentConfig shared.AgentConfig `json:"agent_config,required"`
+	AgentConfig AgentConfig `json:"agent_config,required"`
 	// Unique identifier for the agent
 	AgentID string `json:"agent_id,required"`
 	// Timestamp when the agent was created
@@ -497,7 +496,7 @@ func (r *AgentListResponseDataUnion) UnmarshalJSON(data []byte) error {
 
 type AgentNewParams struct {
 	// The configuration for the agent.
-	AgentConfig shared.AgentConfigParam `json:"agent_config,omitzero,required"`
+	AgentConfig AgentConfigParam `json:"agent_config,omitzero,required"`
 	paramObj
 }
 

agent_test.go

@@ -11,7 +11,6 @@ import (
 	"github.com/llamastack/llama-stack-client-go"
 	"github.com/llamastack/llama-stack-client-go/internal/testutil"
 	"github.com/llamastack/llama-stack-client-go/option"
-	"github.com/llamastack/llama-stack-client-go/shared"
 )
 
 func TestAgentNewWithOptionalParams(t *testing.T) {
@@ -26,7 +25,7 @@ func TestAgentNewWithOptionalParams(t *testing.T) {
 		option.WithBaseURL(baseURL),
 	)
 	_, err := client.Agents.New(context.TODO(), llamastackclient.AgentNewParams{
-		AgentConfig: shared.AgentConfigParam{
+		AgentConfig: llamastackclient.AgentConfigParam{
 			Instructions: "instructions",
 			Model:        "model",
 			ClientTools: []llamastackclient.ToolDefParam{{
@@ -52,31 +51,31 @@ func TestAgentNewWithOptionalParams(t *testing.T) {
 			MaxInferIters:            llamastackclient.Int(0),
 			Name:                     llamastackclient.String("name"),
 			OutputShields:            []string{"string"},
-			ResponseFormat: shared.ResponseFormatUnionParam{
-				OfJsonSchema: &shared.ResponseFormatJsonSchemaParam{
-					JsonSchema: map[string]shared.ResponseFormatJsonSchemaJsonSchemaUnionParam{
+			ResponseFormat: llamastackclient.ResponseFormatUnionParam{
+				OfJsonSchema: &llamastackclient.ResponseFormatJsonSchemaParam{
+					JsonSchema: map[string]llamastackclient.ResponseFormatJsonSchemaJsonSchemaUnionParam{
 						"foo": {
 							OfBool: llamastackclient.Bool(true),
 						},
 					},
 				},
 			},
-			SamplingParams: shared.SamplingParams{
-				Strategy: shared.SamplingParamsStrategyUnion{
-					OfGreedy: &shared.SamplingParamsStrategyGreedy{},
+			SamplingParams: llamastackclient.SamplingParams{
+				Strategy: llamastackclient.SamplingParamsStrategyUnion{
+					OfGreedy: &llamastackclient.SamplingParamsStrategyGreedy{},
 				},
 				MaxTokens:         llamastackclient.Int(0),
 				RepetitionPenalty: llamastackclient.Float(0),
 				Stop:              []string{"string"},
 			},
-			ToolChoice: shared.AgentConfigToolChoiceAuto,
-			ToolConfig: shared.AgentConfigToolConfigParam{
+			ToolChoice: llamastackclient.AgentConfigToolChoiceAuto,
+			ToolConfig: llamastackclient.AgentConfigToolConfigParam{
 				SystemMessageBehavior: "append",
 				ToolChoice:            "auto",
 				ToolPromptFormat:      "json",
 			},
-			ToolPromptFormat: shared.AgentConfigToolPromptFormatJson,
-			Toolgroups: []shared.AgentConfigToolgroupUnionParam{{
+			ToolPromptFormat: llamastackclient.AgentConfigToolPromptFormatJson,
+			Toolgroups: []llamastackclient.AgentConfigToolgroupUnionParam{{
 				OfString: llamastackclient.String("string"),
 			}},
 		},

agentstep.go

@@ -14,7 +14,6 @@ import (
 	"github.com/llamastack/llama-stack-client-go/internal/requestconfig"
 	"github.com/llamastack/llama-stack-client-go/option"
 	"github.com/llamastack/llama-stack-client-go/packages/respjson"
-	"github.com/llamastack/llama-stack-client-go/shared"
 )
 
 // AgentStepService contains methods and other services that help with interacting
@@ -86,21 +85,21 @@ func (r *AgentStepGetResponse) UnmarshalJSON(data []byte) error {
 // Use the methods beginning with 'As' to cast the union to one of its variants.
 type AgentStepGetResponseStepUnion struct {
 	// This field is from variant [InferenceStep].
-	ModelResponse shared.CompletionMessage `json:"model_response"`
-	StepID        string                   `json:"step_id"`
+	ModelResponse CompletionMessage `json:"model_response"`
+	StepID        string            `json:"step_id"`
 	// Any of "inference", "tool_execution", "shield_call", "memory_retrieval".
 	StepType    string    `json:"step_type"`
 	TurnID      string    `json:"turn_id"`
 	CompletedAt time.Time `json:"completed_at"`
 	StartedAt   time.Time `json:"started_at"`
 	// This field is from variant [ToolExecutionStep].
-	ToolCalls []shared.ToolCall `json:"tool_calls"`
+	ToolCalls []ToolCall `json:"tool_calls"`
 	// This field is from variant [ToolExecutionStep].
 	ToolResponses []ToolResponse `json:"tool_responses"`
 	// This field is from variant [ShieldCallStep].
-	Violation shared.SafetyViolation `json:"violation"`
+	Violation SafetyViolation `json:"violation"`
 	// This field is from variant [MemoryRetrievalStep].
-	InsertedContext shared.InterleavedContentUnion `json:"inserted_context"`
+	InsertedContext InterleavedContentUnion `json:"inserted_context"`
 	// This field is from variant [MemoryRetrievalStep].
 	VectorDBIDs string `json:"vector_db_ids"`
 	JSON        struct {