embed-client 1.0.0__tar.gz → 1.0.0.1__tar.gz

{embed_client-1.0.0 → embed_client-1.0.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: embed-client
-Version: 1.0.0
+Version: 1.0.0.1
 Summary: Async client for Embedding Service API
 Author: Your Name
 Requires-Dist: aiohttp

{embed_client-1.0.0 → embed_client-1.0.0.1}/embed_client/async_client.py

@@ -153,6 +153,37 @@ class EmbeddingServiceAsyncClient:
         except Exception as e:
             raise EmbeddingServiceError(f"Unexpected error: {e}") from e
 
+    def _validate_texts(self, texts: List[str]) -> None:
+        """
+        Validate input texts before sending to the API.
+        Args:
+            texts (List[str]): List of texts to validate
+        Raises:
+            EmbeddingServiceAPIError: If texts are invalid
+        """
+        if not texts:
+            raise EmbeddingServiceAPIError({
+                "code": -32602,
+                "message": "Empty texts list provided"
+            })
+        
+        invalid_texts = []
+        for i, text in enumerate(texts):
+            if not isinstance(text, str):
+                invalid_texts.append(f"Text at index {i} is not a string")
+                continue
+            if not text or not text.strip():
+                invalid_texts.append(f"Text at index {i} is empty or contains only whitespace")
+            elif len(text.strip()) < 2:  # Минимальная длина текста
+                invalid_texts.append(f"Text at index {i} is too short (minimum 2 characters)")
+        
+        if invalid_texts:
+            raise EmbeddingServiceAPIError({
+                "code": -32602,
+                "message": "Invalid input texts",
+                "details": invalid_texts
+            })
+
     async def cmd(self, command: str, params: Optional[Dict[str, Any]] = None, base_url: Optional[str] = None, port: Optional[int] = None) -> Dict[str, Any]:
         """
         Execute a command via JSON-RPC protocol.
@@ -166,7 +197,8 @@ class EmbeddingServiceAsyncClient:
                 {
                     "error": {
                         "code": <код ошибки>,
-                        "message": <сообщение об ошибке>
+                        "message": <сообщение об ошибке>,
+                        "details": <опциональные детали ошибки>
                     }
                 }
                 или
@@ -180,31 +212,50 @@ class EmbeddingServiceAsyncClient:
                 }
         """
         if not command:
-            raise EmbeddingServiceAPIError("Command is required")
+            raise EmbeddingServiceAPIError({
+                "code": -32602,
+                "message": "Command is required"
+            })
+
+        # Валидация текстов для команды embed
+        if command == "embed" and params and "texts" in params:
+            self._validate_texts(params["texts"])
+
         url = self._make_url("/cmd", base_url, port)
         payload = {"command": command}
         if params is not None:
             payload["params"] = params
+
         try:
             async with self._session.post(url, json=payload) as resp:
                 await self._raise_for_status(resp)
                 data = await resp.json()
+                
                 if "error" in data:
                     raise EmbeddingServiceAPIError(data["error"])
+                
                 if "result" in data:
                     res = data["result"]
                     if isinstance(res, dict) and "success" in res and res["success"] is False:
                         if "error" in res:
                             raise EmbeddingServiceAPIError(res["error"])
+                
                 return data
+                
         except aiohttp.ClientConnectionError as e:
-            raise EmbeddingServiceAPIError(f"Connection error: {e}") from e
+            raise EmbeddingServiceAPIError({
+                "code": -32000,
+                "message": f"Connection error: {e}"
+            }) from e
         except aiohttp.ClientResponseError as e:
             raise EmbeddingServiceHTTPError(e.status, e.message) from e
         except EmbeddingServiceHTTPError:
             raise
         except Exception as e:
-            raise EmbeddingServiceAPIError(f"Unexpected error: {e}") from e
+            raise EmbeddingServiceAPIError({
+                "code": -32000,
+                "message": f"Unexpected error: {e}"
+            }) from e
 
     async def _raise_for_status(self, resp: aiohttp.ClientResponse):
         try:

{embed_client-1.0.0 → embed_client-1.0.0.1}/embed_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: embed-client
-Version: 1.0.0
+Version: 1.0.0.1
 Summary: Async client for Embedding Service API
 Author: Your Name
 Requires-Dist: aiohttp

{embed_client-1.0.0 → embed_client-1.0.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "embed-client"
-version = "1.0.0"
+version = "1.0.0.001"
 description = "Async client for Embedding Service API"
 authors = [{name = "Your Name"}]
 dependencies = [

{embed_client-1.0.0 → embed_client-1.0.0.1}/tests/test_async_client.py

@@ -137,11 +137,11 @@ async def test_cmd_success(client):
 # Некорректные параметры: не-строка в texts
 @pytest.mark.asyncio
 async def test_embed_non_string_text(client):
-    mock_response = MockAiohttpResponse(json_data={"error": {"code": 422, "message": "Invalid input"}})
-    with patch.object(client._session, 'post', return_value=mock_response) as mock_post:
-        with pytest.raises(EmbeddingServiceAPIError) as excinfo:
-            await client.cmd("embed", params={"texts": [123, "ok"]})
-        assert "Invalid input" in str(excinfo.value)
+    """Test validation of non-string values in texts list."""
+    with pytest.raises(EmbeddingServiceAPIError) as excinfo:
+        await client.cmd("embed", params={"texts": [123, "ok"]})
+    assert "Invalid input texts" in str(excinfo.value)
+    assert "Text at index 0 is not a string" in str(excinfo.value)
 
 # Некорректные параметры: невалидный params
 @pytest.mark.asyncio
@@ -282,4 +282,36 @@ async def test_aenter_aexit_exceptions():
             raise RuntimeError("fail")
     client._session = BadSession()
     with pytest.raises(RuntimeError):
-        await client.__aexit__(None, None, None) 
+        await client.__aexit__(None, None, None)
+
+@pytest.mark.asyncio
+async def test_embed_validation():
+    """Test validation of input texts for embed command."""
+    client = EmbeddingServiceAsyncClient()
+    
+    # Test empty texts list
+    with pytest.raises(EmbeddingServiceAPIError) as excinfo:
+        await client.cmd("embed", params={"texts": []})
+    assert "Empty texts list provided" in str(excinfo.value)
+    
+    # Test empty strings
+    with pytest.raises(EmbeddingServiceAPIError) as excinfo:
+        await client.cmd("embed", params={"texts": ["", "   "]})
+    assert "Invalid input texts" in str(excinfo.value)
+    assert "Text at index 0 is empty" in str(excinfo.value)
+    assert "Text at index 1 is empty" in str(excinfo.value)
+    
+    # Test too short texts
+    with pytest.raises(EmbeddingServiceAPIError) as excinfo:
+        await client.cmd("embed", params={"texts": ["a", "b"]})
+    assert "Invalid input texts" in str(excinfo.value)
+    assert "Text at index 0 is too short" in str(excinfo.value)
+    assert "Text at index 1 is too short" in str(excinfo.value)
+    
+    # Test mixed valid and invalid texts
+    with pytest.raises(EmbeddingServiceAPIError) as excinfo:
+        await client.cmd("embed", params={"texts": ["valid text", "", "   ", "a"]})
+    assert "Invalid input texts" in str(excinfo.value)
+    assert "Text at index 1 is empty" in str(excinfo.value)
+    assert "Text at index 2 is empty" in str(excinfo.value)
+    assert "Text at index 3 is too short" in str(excinfo.value)