echa-cli 1.0.0__tar.gz → 1.1.0__tar.gz

{echa_cli-1.0.0 → echa_cli-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echa-cli
-Version: 1.0.0
+Version: 1.1.0
 Summary: ECHA Chemical Data CLI — query European Chemicals Agency data from the command line or MCP server
 Author: MagaritaZhu
 License-Expression: MIT
@@ -22,11 +22,12 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: mcp[cli]>=1.0.0
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: beautifulsoup4>=4.12.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: typer>=0.9.0
+Provides-Extra: mcp
+Requires-Dist: mcp[cli]>=1.0.0; extra == "mcp"
 Dynamic: license-file
 
 # ECHA Chemical Data MCP Server

{echa_cli-1.0.0 → echa_cli-1.1.0}/echa_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echa-cli
-Version: 1.0.0
+Version: 1.1.0
 Summary: ECHA Chemical Data CLI — query European Chemicals Agency data from the command line or MCP server
 Author: MagaritaZhu
 License-Expression: MIT
@@ -22,11 +22,12 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: mcp[cli]>=1.0.0
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: beautifulsoup4>=4.12.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: typer>=0.9.0
+Provides-Extra: mcp
+Requires-Dist: mcp[cli]>=1.0.0; extra == "mcp"
 Dynamic: license-file
 
 # ECHA Chemical Data MCP Server

{echa_cli-1.0.0 → echa_cli-1.1.0}/echa_cli.egg-info/requires.txt

@@ -1,5 +1,7 @@
-mcp[cli]>=1.0.0
 httpx>=0.27.0
 beautifulsoup4>=4.12.0
 pydantic>=2.0.0
 typer>=0.9.0
+
+[mcp]
+mcp[cli]>=1.0.0

{echa_cli-1.0.0 → echa_cli-1.1.0}/echa_mcp/cli.py

@@ -3,13 +3,15 @@
 ECHA Chemical Data CLI — query European Chemicals Agency data from the command line.
 
 Usage:
+    echa-cli search ethanol
+    echa-cli search 50-00-0
     echa-cli substance-info 100.000.002
     echa-cli harmonised 100.000.002
     echa-cli tox-summary 100.000.002
-    echa-cli tox-studies 100.000.002 --section 7.2 --max-studies 10
 """
 
 import asyncio
+import json
 import sys
 from typing import Optional
 
@@ -41,6 +43,47 @@ def _run_async(coro):
         loop.close()
 
 
+# ─── Search (resolve CAS/name → substance_index) ─────────────
+
+
+@app.command()
+def search(
+    query: str = typer.Argument(help="CAS number, chemical name, or EC number"),
+    max_results: int = typer.Option(5, help="Maximum results to return"),
+):
+    """Search ECHA for a substance by CAS number, name, or EC number. Returns substance_index."""
+    async def _search():
+        from .clients.echa_client import get_client
+
+        client = get_client()
+        http_client = await client._get_client()
+
+        url = "/api-substance/v1/substance"
+        params = {"searchText": query, "pageIndex": 1, "pageSize": max_results}
+        resp = await http_client.get(url, params=params)
+        resp.raise_for_status()
+        data = resp.json()
+
+        items = data.get("items", [])
+        if not items:
+            return json.dumps({"error": f"No results for '{query}'"}, indent=2)
+
+        results = []
+        for item in items[:max_results]:
+            idx = item.get("substanceIndex", {})
+            results.append({
+                "substance_index": idx.get("rmlId", ""),
+                "name": idx.get("rmlName", ""),
+                "cas_number": idx.get("rmlCas", ""),
+                "ec_number": idx.get("rmlEc", ""),
+                "molecular_formula": idx.get("rmlMolFormula", ""),
+            })
+
+        return json.dumps({"query": query, "total": len(results), "results": results}, ensure_ascii=False, indent=2)
+
+    _run_async(_search())
+
+
 # ─── Substance Info ───────────────────────────────────────────
 
 

{echa_cli-1.0.0 → echa_cli-1.1.0}/echa_mcp/server.py

@@ -15,7 +15,13 @@ Also exposes H-code mapping table as an MCP Resource.
 import json
 import logging
 
-from mcp.server.fastmcp import FastMCP
+try:
+    from mcp.server.fastmcp import FastMCP
+except ImportError:
+    raise ImportError(
+        "MCP SDK is required for the server. "
+        "Install with: pip install echa-cli[mcp]"
+    )
 
 from .models.substance import SubstanceInfoInput, DossierListInput
 from .models.classification import (

{echa_cli-1.0.0 → echa_cli-1.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "echa-cli"
-version = "1.0.0"
+version = "1.1.0"
 description = "ECHA Chemical Data CLI — query European Chemicals Agency data from the command line or MCP server"
 readme = "README.md"
 license = "MIT"
@@ -23,13 +23,15 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "mcp[cli]>=1.0.0",
     "httpx>=0.27.0",
     "beautifulsoup4>=4.12.0",
     "pydantic>=2.0.0",
     "typer>=0.9.0",
 ]
 
+[project.optional-dependencies]
+mcp = ["mcp[cli]>=1.0.0"]
+
 [project.urls]
 Homepage = "https://github.com/RmMargt/echa-cli"
 Repository = "https://github.com/RmMargt/echa-cli"