minor change

Author: sawa3030

optuna_mcp/server.py

@@ -65,9 +65,9 @@ class StudyResponse(BaseModel):
     study_name: str
     sampler_name: (
         typing.Literal["TPESampler", "NSGAIISampler", "RandomSampler", "GPSampler"] | None
-    ) = Field(default=None, description="The name of the sampler used in the study, if available.")
+    ) = Field(default=None, description="The name of the sampler used in the study.")
     directions: list[str] | None = Field(
-        default=None, description="The optimization directions for each objective, if available."
+        default=None, description="The optimization directions for each objective."
     )
 
 
@@ -77,13 +77,13 @@ class TrialResponse(BaseModel):
         default=None, description="The parameter values suggested by the trial."
     )
     values: list[float] | None = Field(
-        default=None, description="The objective values of the trial, if available."
+        default=None, description="The objective values of the trial."
     )
     user_attrs: dict[str, typing.Any] | None = Field(
-        default=None, description="User-defined attributes for the trial, if any."
+        default=None, description="User-defined attributes for the trial."
     )
     system_attrs: dict[str, typing.Any] | None = Field(
-        default=None, description="System-defined attributes for the trial, if any."
+        default=None, description="System-defined attributes for the trial."
     )
 
 
@@ -214,7 +214,6 @@ def get_trial_user_attrs(trial_number: int) -> TrialResponse:
             mcp.study._study_id, trial_number
         )
         trial = storage.get_trial(trial_id)
-        # return f"User attributes in trial {trial_number}: {json.dumps(trial.user_attrs)}"
         return TrialResponse(
             trial_number=trial_number,
             user_attrs=trial.user_attrs,
@@ -599,6 +598,3 @@ def main() -> None:
 
 if __name__ == "__main__":
     main()
-
-mcp = OptunaMCP("Optuna")
-mcp = register_tools(mcp)

tests/test_server.py

@@ -96,7 +96,6 @@ async def test_get_all_study_names(mcp: OptunaMCP) -> None:
         assert isinstance(result[1], dict)
         assert result[1]["result"] == "No storage specified."
     else:
-        assert all(isinstance(result, StudyResponse) for result in result[0])
         assert result[0] == []
         assert isinstance(result[1], dict)
         assert result[1]["result"] == []
@@ -159,7 +158,7 @@ async def test_set_sampler(mcp: OptunaMCP, sampler_name: str) -> None:
     assert len(result) == 2
     assert isinstance(result[0][0], TextContent)
     assert isinstance(StudyResponse(**result[1]), StudyResponse)
-    assert all(sampler_name == json.loads(result.text)["sampler_name"] for result in result[0])
+    assert sampler_name == json.loads(result[0][0].text)["sampler_name"]
     assert sampler_name == result[1]["sampler_name"]
     assert isinstance(mcp.study.sampler, getattr(optuna.samplers, sampler_name))
 
@@ -251,7 +250,6 @@ async def test_get_trials(mcp: OptunaMCP) -> None:
     assert len(result) == 2
     assert isinstance(result[0][0], TextContent)
     assert isinstance(result[1], dict)
-    # assert isinstance(result[0], TextContent)
     lines_from_text = result[0][0].text.strip().split("\n")
     lines_from_dict = result[1]["result"].strip().split("\n")
 
@@ -290,9 +288,7 @@ async def test_best_trials(mcp: OptunaMCP) -> None:
     assert isinstance(result, Sequence)
     assert len(result) == 2
     assert isinstance(result[0][0], TextContent)
-    assert all(
-        isinstance(TrialResponse(**result), TrialResponse) for result in result[1]["result"]
-    )
+    assert isinstance(TrialResponse(**result[1]["result"][0]), TrialResponse)
 
 
 @pytest.mark.anyio