Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added db_utils tests #53

Merged
merged 5 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ jobs:
mypy src/ swarm_copy/
# Include src/ directory in Python path to prioritize local files in pytest
export PYTHONPATH=$(pwd)/src:$PYTHONPATH
pytest --color=yes
pytest --color=yes tests/ swarm_copy_tests/
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Tool implementations without langchain or langgraph dependencies
- CRUDs.
- BlueNaas CRUD tools
- Unit tests for database

### Fixed
- Migrate LLM Evaluation logic to scripts and add tests
Expand Down
4 changes: 2 additions & 2 deletions swarm_copy/tools/bluenaas_memodel_getall.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
kanesoban marked this conversation as resolved.
Show resolved Hide resolved
memodel_type: Literal["single-neuron-simulation", "synaptome-simulation"] = Field(
default="single-neuron-simulation",
description="Type of simulation to retrieve.",
)
Expand All @@ -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.memodel_type,
"offset": self.input_schema.offset,
"page_size": self.input_schema.page_size,
},
Expand Down
4 changes: 2 additions & 2 deletions swarm_copy/tools/bluenaas_memodel_getone.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class MEModelGetOneMetadata(BaseMetadata):
class InputMEModelGetOne(BaseModel):
"""Inputs for the BlueNaaS single-neuron simulation."""

model_id: str = Field(
memodel_id: str = Field(
description="ID of the model to retrieve. Should be an https link."
)

Expand All @@ -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.memodel_id)}",
headers={"Authorization": f"Bearer {self.metadata.token}"},
)

Expand Down
3 changes: 2 additions & 1 deletion swarm_copy/tools/traces_tool.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Traces tool."""

import logging
from pathlib import Path
from typing import Any, ClassVar

from pydantic import BaseModel, Field
Expand Down Expand Up @@ -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):
Expand Down
1 change: 1 addition & 0 deletions swarm_copy_tests/app/database/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"""Unit tests for database."""
Loading
Loading