Fixed breaking changes

BlueBrain · Nov 20, 2024 · 8a0bc33 · 8a0bc33
1 parent 3416a0f
commit 8a0bc33
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/swarm_copy/tools/bluenaas_memodel_getall.py b/swarm_copy/tools/bluenaas_memodel_getall.py
@@ -29,7 +29,7 @@ class InputMEModelGetAll(BaseModel):
     page_size: int = Field(
         default=20, description="Number of results returned by the API."
     )
-    model_type: Literal["single-neuron-simulation", "synaptome-simulation"] = Field(
+    simulation_type: Literal["single-neuron-simulation", "synaptome-simulation"] = Field(
         default="single-neuron-simulation",
         description="Type of simulation to retrieve.",
     )
@@ -55,7 +55,7 @@ async def arun(self) -> PaginatedResponseUnionMEModelResponseSynaptomeModelRespo
         response = await self.metadata.httpx_client.get(
             url=f"{self.metadata.bluenaas_url}/neuron-model/{self.metadata.vlab_id}/{self.metadata.project_id}/me-models",
             params={
-                "simulation_type": self.input_schema.model_type,
+                "simulation_type": self.input_schema.simulation_type,
                 "offset": self.input_schema.offset,
                 "page_size": self.input_schema.page_size,
             },

diff --git a/swarm_copy/tools/bluenaas_memodel_getone.py b/swarm_copy/tools/bluenaas_memodel_getone.py
@@ -24,7 +24,7 @@ class MEModelGetOneMetadata(BaseMetadata):
 class InputMEModelGetOne(BaseModel):
     """Inputs for the BlueNaaS single-neuron simulation."""
 
-    model_id: str = Field(
+    simulation_id: str = Field(
         description="ID of the model to retrieve. Should be an https link."
     )
 
@@ -45,7 +45,7 @@ async def arun(self) -> MEModelResponse:
         )
 
         response = await self.metadata.httpx_client.get(
-            url=f"{self.metadata.bluenaas_url}/neuron-model/{self.metadata.vlab_id}/{self.metadata.project_id}/{quote_plus(self.input_schema.model_id)}",
+            url=f"{self.metadata.bluenaas_url}/neuron-model/{self.metadata.vlab_id}/{self.metadata.project_id}/{quote_plus(self.input_schema.simulation_id)}",
             headers={"Authorization": f"Bearer {self.metadata.token}"},
         )
 

diff --git a/swarm_copy/tools/traces_tool.py b/swarm_copy/tools/traces_tool.py
@@ -1,6 +1,7 @@
 """Traces tool."""
 
 import logging
+from pathlib import Path
 from typing import Any, ClassVar
 
 from pydantic import BaseModel, Field
@@ -46,7 +47,7 @@ class GetTracesMetadata(BaseMetadata):
     knowledge_graph_url: str
     token: str
     trace_search_size: int
-    brainregion_path: str
+    brainregion_path: str | Path
 
 
 class GetTracesTool(BaseTool):