manual fix

Author: ks6088ts

.env.template

@@ -19,9 +19,8 @@ AZURE_AI_SPEECH_API_KEY="<YOUR_AZURE_AI_SPEECH_API_KEY>"
 AZURE_AI_SPEECH_ENDPOINT="https://<speech-api-name>.cognitiveservices.azure.com/"
 
 # Azure AI Foundry
-AZURE_AI_FOUNDRY_PROJECT_CONNECTION_STRING="https://<YOUR_PROJECT_NAME>.eastus.inference.ai.azure.com"
+AZURE_AI_FOUNDRY_PROJECT_ENDPOINT="https://xxx.services.ai.azure.com/api/projects/yyy"
 AZURE_AI_FOUNDRY_API_KEY="<YOUR_API_KEY>"
-AZURE_AI_FOUNDRY_PROJECT_ID="<YOUR_PROJECT_ID>"
 
 # Chats WebSocket
 # Azure Container Apps: `wss://yourcontainerapps.japaneast.azurecontainerapps.io`

pyproject.toml

@@ -71,3 +71,4 @@ possibly-unbound-attribute = "ignore" # Ignore possibly unbound attributes in cl
 unknown-argument = "ignore" # Ignore unknown arguments in function calls
 invalid-assignment = "ignore" # Ignore invalid assignments
 invalid-argument-type = "ignore" # Ignore invalid argument types
+invalid-return-type = "ignore" # Ignore invalid return types

scripts/agents.py

@@ -83,15 +83,13 @@ def get_agent(
 @app.command()
 def list_agents(
     limit: int = typer.Option(10, "--limit", "-l", help="取得する件数"),
-    offset: int = typer.Option(0, "--offset", "-o", help="オフセット"),
 ):
     """エージェントの一覧を取得する"""
     console.print("[bold green]エージェント一覧を取得します[/bold green]")
     console.print(f"取得件数: {limit}")
-    console.print(f"オフセット: {offset}")
 
     try:
-        agents_response = agent_repo.list_agents(limit=limit, offset=offset)
+        agents_response = agent_repo.list_agents(limit=limit)
 
         if not agents_response.agents:
             console.print("[yellow]エージェントが見つかりません[/yellow]")

template_fastapi/models/agent.py

@@ -15,11 +15,10 @@ class AgentStatus(str, Enum):
 class AgentRequest(BaseModel):
     """Request model for creating an agent"""
 
-    name: str
-    description: str | None = None
-    instructions: str | None = None
+    name: str = "Default Agent"
+    description: str | None = "Hello Agent"
+    instructions: str | None = "You are a helpful assistant."
     model: str = "gpt-4o"
-    tools: list[dict[str, Any]] | None = None
 
 
 class AgentResponse(BaseModel):
@@ -36,6 +35,19 @@ class AgentResponse(BaseModel):
     updated_at: str
 
 
+class ThreadRequest(BaseModel):
+    """Request model for creating a chat thread"""
+
+    pass
+
+
+class ThreadResponse(BaseModel):
+    """Response model for chat thread"""
+
+    id: str
+    created_at: str
+
+
 class ChatRequest(BaseModel):
     """Request model for chat with agent"""
 
@@ -59,3 +71,10 @@ class AgentListResponse(BaseModel):
 
     agents: list[AgentResponse]
     total: int
+
+
+class ThreadListResponse(BaseModel):
+    """Response model for listing threads"""
+
+    threads: list[ThreadResponse]
+    total: int

template_fastapi/repositories/agents.py

@@ -1,5 +1,6 @@
 from datetime import datetime
 
+from azure.ai.agents.models import CodeInterpreterTool
 from azure.ai.projects import AIProjectClient
 from azure.identity import DefaultAzureCredential
 
@@ -10,17 +11,22 @@
     AgentStatus,
     ChatRequest,
     ChatResponse,
+    ThreadListResponse,
+    ThreadRequest,
+    ThreadResponse,
 )
 from template_fastapi.settings.azure_ai_foundry import get_azure_ai_foundry_settings
 
+code_interpreter = CodeInterpreterTool()
+
 
 class AgentRepository:
     """Repository for handling agent-related operations with Azure AI Foundry."""
 
     def __init__(self):
         self.settings = get_azure_ai_foundry_settings()
         self.client = AIProjectClient(
-            self.settings.azure_ai_foundry_project_connection_string,
+            endpoint=self.settings.azure_ai_foundry_project_endpoint,
             credential=DefaultAzureCredential(),
         )
 
@@ -32,7 +38,7 @@ def create_agent(self, request: AgentRequest) -> AgentResponse:
                 name=request.name,
                 description=request.description,
                 instructions=request.instructions,
-                tools=request.tools or [],
+                tools=code_interpreter.definitions,
             )
 
             now = datetime.now().isoformat()
@@ -72,15 +78,17 @@ def get_agent(self, agent_id: str) -> AgentResponse:
         except Exception as e:
             raise Exception(f"Failed to get agent: {str(e)}")
 
-    def list_agents(self, limit: int = 10, offset: int = 0) -> AgentListResponse:
+    def list_agents(self, limit: int = 10) -> AgentListResponse:
         """List agents."""
         try:
-            agents_response = self.client.agents.list_agents()
+            agents_response = self.client.agents.list_agents(
+                limit=limit,
+            )
 
             now = datetime.now().isoformat()
 
             agents = []
-            for agent in agents_response.data:
+            for agent in agents_response:
                 agents.append(
                     AgentResponse(
                         id=agent.id,
@@ -96,7 +104,7 @@ def list_agents(self, limit: int = 10, offset: int = 0) -> AgentListResponse:
                 )
 
             return AgentListResponse(
-                agents=agents[offset : offset + limit],
+                agents=agents,
                 total=len(agents),
             )
         except Exception as e:
@@ -113,46 +121,82 @@ def delete_agent(self, agent_id: str) -> bool:
     def chat_with_agent(self, agent_id: str, request: ChatRequest) -> ChatResponse:
         """Chat with an agent."""
         try:
-            # Create a thread if not provided
-            if request.thread_id:
-                thread_id = request.thread_id
-            else:
-                thread_response = self.client.agents.create_thread()
-                thread_id = thread_response.id
-
-            # Create a message
-            message_response = self.client.agents.create_message(
-                thread_id=thread_id,
+            _ = self.client.agents.messages.create(
+                thread_id=request.thread_id,
                 role="user",
                 content=request.message,
             )
 
-            # Create a run
-            run_response = self.client.agents.create_run(
-                thread_id=thread_id,
-                assistant_id=agent_id,
+            run = self.client.agents.runs.create_and_process(
+                agent_id=agent_id,
+                thread_id=request.thread_id,
             )
 
-            # Poll for completion
-            while run_response.status in ["queued", "in_progress"]:
-                run_response = self.client.agents.get_run(
-                    thread_id=thread_id,
-                    run_id=run_response.id,
+            print(f"Run ID: {run.id}m status: {run.last_error}")
+
+            messages = self.client.agents.messages.list(
+                thread_id=request.thread_id,
+            )
+
+            # FIXME: Iterable object の最初のメッセージを取得
+            for message in messages:
+                return ChatResponse(
+                    id=run.id,
+                    agent_id=agent_id,
+                    thread_id=request.thread_id,
+                    message=request.message,
+                    response=message.content.__str__() if messages else "",
+                    created_at=message.created_at.isoformat() if messages else "",
                 )
 
-            # Get the response
-            messages = self.client.agents.list_messages(thread_id=thread_id)
-            response_message = messages.data[0].content[0].text.value
+        except Exception as e:
+            raise Exception(f"Failed to chat with agent: {str(e)}")
 
-            now = datetime.now().isoformat()
+    def create_thread(self, request: ThreadRequest) -> ThreadResponse:
+        """Create a new thread for chatting with an agent."""
+        try:
+            thread_response = self.client.agents.threads.create(**request.model_dump())
+            return ThreadResponse(
+                id=thread_response.id,
+                created_at=thread_response.created_at.isoformat(),
+            )
+        except Exception as e:
+            raise Exception(f"Failed to create thread: {str(e)}")
 
-            return ChatResponse(
-                id=message_response.id,
-                agent_id=agent_id,
-                thread_id=thread_id,
-                message=request.message,
-                response=response_message,
-                created_at=now,
+    def get_thread(self, thread_id: str) -> ThreadResponse:
+        """Get a specific thread by ID."""
+        try:
+            thread_response = self.client.agents.threads.get(thread_id=thread_id)
+            return ThreadResponse(
+                id=thread_response.id,
+                created_at=thread_response.created_at.isoformat(),
             )
         except Exception as e:
-            raise Exception(f"Failed to chat with agent: {str(e)}")
+            raise Exception(f"Failed to get thread: {str(e)}")
+
+    def delete_thread(self, thread_id: str) -> bool:
+        """Delete a specific thread by ID."""
+        try:
+            self.client.agents.threads.delete(thread_id=thread_id)
+            return True
+        except Exception as e:
+            raise Exception(f"Failed to delete thread: {str(e)}")
+
+    def list_threads(self, limit: int) -> ThreadListResponse:
+        """List threads for a specific agent."""
+        try:
+            threads_response = self.client.agents.threads.list(limit=limit)
+            threads = []
+            for thread in threads_response:
+                threads.append(
+                    ThreadResponse(
+                        id=thread.id,
+                        created_at=thread.created_at.isoformat(),
+                    )
+                )
+            return ThreadListResponse(
+                threads=threads,
+                total=len(threads),
+            )
+        except Exception as e:
+            raise Exception(f"Failed to list threads: {str(e)}")

template_fastapi/routers/agents.py

@@ -1,4 +1,3 @@
-
 from fastapi import APIRouter, HTTPException, Query
 
 from template_fastapi.models.agent import (
@@ -7,6 +6,9 @@
     AgentResponse,
     ChatRequest,
     ChatResponse,
+    ThreadListResponse,
+    ThreadRequest,
+    ThreadResponse,
 )
 from template_fastapi.repositories.agents import AgentRepository
 
@@ -54,13 +56,12 @@ async def get_agent(agent_id: str) -> AgentResponse:
 )
 async def list_agents(
     limit: int = Query(default=10, ge=1, le=100, description="取得する件数"),
-    offset: int = Query(default=0, ge=0, description="オフセット"),
 ) -> AgentListResponse:
     """
     エージェントの一覧を取得する
     """
     try:
-        return agent_repo.list_agents(limit=limit, offset=offset)
+        return agent_repo.list_agents(limit=limit)
     except Exception as e:
         raise HTTPException(status_code=500, detail=f"エージェント一覧の取得に失敗しました: {str(e)}")
 
@@ -98,3 +99,72 @@ async def chat_with_agent(agent_id: str, request: ChatRequest) -> ChatResponse:
         return agent_repo.chat_with_agent(agent_id, request)
     except Exception as e:
         raise HTTPException(status_code=500, detail=f"エージェントとのチャットに失敗しました: {str(e)}")
+
+
+@router.post(
+    "/agents/threads/",
+    response_model=ThreadResponse,
+    tags=["agents"],
+    operation_id="create_thread",
+)
+async def create_thread(request: ThreadRequest) -> ThreadResponse:
+    """
+    新しいスレッドを作成する
+    """
+    try:
+        return agent_repo.create_thread(request)
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=f"スレッドの作成に失敗しました: {str(e)}")
+
+
+@router.get(
+    "/agents/threads/{thread_id}",
+    response_model=ThreadResponse,
+    tags=["agents"],
+    operation_id="get_thread",
+)
+async def get_thread(thread_id: str) -> ThreadResponse:
+    """
+    スレッドの情報を取得する
+    """
+    try:
+        return agent_repo.get_thread(thread_id)
+    except Exception as e:
+        raise HTTPException(status_code=404, detail=f"スレッドが見つかりません: {str(e)}")
+
+
+@router.delete(
+    "/agents/threads/{thread_id}",
+    tags=["agents"],
+    operation_id="delete_thread",
+)
+async def delete_thread(thread_id: str) -> dict:
+    """
+    スレッドを削除する
+    """
+    try:
+        success = agent_repo.delete_thread(thread_id)
+        if success:
+            return {"message": "スレッドが正常に削除されました"}
+        else:
+            raise HTTPException(status_code=500, detail="スレッドの削除に失敗しました")
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=f"スレッドの削除に失敗しました: {str(e)}")
+
+
+@router.get(
+    "/agents/threads/",
+    response_model=ThreadListResponse,
+    tags=["agents"],
+    operation_id="list_threads",
+)
+async def list_threads(
+    limit: int = Query(default=10, ge=1, le=100, description="取得する件数"),
+) -> ThreadListResponse:
+    """
+    エージェントのスレッド一覧を取得する
+    """
+    try:
+        return agent_repo.list_threads(limit=limit)
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=f"スレッド一覧の取得に失敗しました: {str(e)}")

template_fastapi/settings/azure_ai_foundry.py

@@ -4,9 +4,8 @@
 
 
 class Settings(BaseSettings):
-    azure_ai_foundry_project_connection_string: str = "https://<YOUR_PROJECT_NAME>.eastus.inference.ai.azure.com"
+    azure_ai_foundry_project_endpoint: str = "https://xxx.services.ai.azure.com/api/projects/yyy"
     azure_ai_foundry_api_key: str = "<YOUR_API_KEY>"
-    azure_ai_foundry_project_id: str = "<YOUR_PROJECT_ID>"
 
     model_config = SettingsConfigDict(
         env_file=".env",