embed-client 0.0.1__py3-none-any.whl → 1.0.0.1__py3-none-any.whl

embed_client/async_client.py

@@ -8,6 +8,7 @@ Async client for Embedding Service API (OpenAPI 3.0.2)
 
 from typing import Any, Dict, List, Optional, Union
 import aiohttp
+import os
 
 class EmbeddingServiceError(Exception):
     """Base exception for EmbeddingServiceAsyncClient."""
@@ -37,13 +38,13 @@ class EmbeddingServiceAsyncClient:
     Raises:
         ValueError: If base_url or port is not provided.
     """
-    def __init__(self, base_url: str, port: int):
-        if not base_url:
+    def __init__(self, base_url: Optional[str] = None, port: Optional[int] = None):
+        self.base_url = base_url or os.getenv("EMBEDDING_SERVICE_BASE_URL", "http://localhost")
+        if not self.base_url:
             raise ValueError("base_url must be provided.")
-        if port is None:
+        self.port = port or int(os.getenv("EMBEDDING_SERVICE_PORT", "8001"))
+        if self.port is None:
             raise ValueError("port must be provided.")
-        self.base_url = base_url.rstrip("/")
-        self.port = port
         self._session: Optional[aiohttp.ClientSession] = None
 
     def _make_url(self, path: str, base_url: Optional[str] = None, port: Optional[int] = None) -> str:
@@ -51,6 +52,23 @@ class EmbeddingServiceAsyncClient:
         port_val = port if port is not None else self.port
         return f"{url}:{port_val}{path}"
 
+    def _format_error_response(self, error: str, lang: Optional[str] = None, text: Optional[str] = None) -> Dict[str, Any]:
+        """
+        Format error response in a standard way.
+        Args:
+            error (str): Error message
+            lang (str, optional): Language of the text that caused the error
+            text (str, optional): Text that caused the error
+        Returns:
+            dict: Formatted error response
+        """
+        response = {"error": f"Embedding service error: {error}"}
+        if lang is not None:
+            response["lang"] = lang
+        if text is not None:
+            response["text"] = text
+        return response
+
     async def __aenter__(self):
         self._session = aiohttp.ClientSession()
         return self
@@ -135,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.
@@ -144,32 +193,69 @@ class EmbeddingServiceAsyncClient:
             base_url (str, optional): Override base URL.
             port (int, optional): Override port.
         Returns:
-            dict: Command execution result.
+            dict: Command execution result or error response in format:
+                {
+                    "error": {
+                        "code": <код ошибки>,
+                        "message": <сообщение об ошибке>,
+                        "details": <опциональные детали ошибки>
+                    }
+                }
+                или
+                {
+                    "result": {
+                        "success": true,
+                        "data": {
+                            "embeddings": [[...], ...]
+                        }
+                    }
+                }
         """
+        if not command:
+            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 EmbeddingServiceAPIError:
-            raise
-        except EmbeddingServiceHTTPError:
-            raise
-        except EmbeddingServiceConnectionError:
-            raise
+                
         except aiohttp.ClientConnectionError as e:
-            raise EmbeddingServiceConnectionError(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 EmbeddingServiceError(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/example_async_usage.py

@@ -2,7 +2,7 @@
 Example usage of EmbeddingServiceAsyncClient.
 
 This example demonstrates how to use the async client to check the health of the embedding service,
-request embeddings, and handle all possible exceptions.
+request embeddings, and handle all possible errors.
 
 Run this script with:
     python -m asyncio embed_client/example_async_usage.py --base-url http://localhost --port 8001
@@ -13,13 +13,7 @@ You can also set EMBED_CLIENT_BASE_URL and EMBED_CLIENT_PORT environment variabl
 import asyncio
 import sys
 import os
-from embed_client.async_client import (
-    EmbeddingServiceAsyncClient,
-    EmbeddingServiceConnectionError,
-    EmbeddingServiceHTTPError,
-    EmbeddingServiceAPIError,
-    EmbeddingServiceError,
-)
+from embed_client.async_client import EmbeddingServiceAsyncClient
 
 def get_params():
     base_url = None
@@ -41,54 +35,35 @@ def get_params():
 
 async def main():
     base_url, port = get_params()
-    # Always use try/except to handle all possible errors
-    try:
-        async with EmbeddingServiceAsyncClient(base_url=base_url, port=port) as client:
-            # Check health
-            try:
-                health = await client.health()
-                print("Service health:", health)
-            except EmbeddingServiceConnectionError as e:
-                print("[Connection error]", e)
-                return
-            except EmbeddingServiceHTTPError as e:
-                print(f"[HTTP error] {e.status}: {e.message}")
-                return
-            except EmbeddingServiceError as e:
-                print("[Other error]", e)
-                return
+    async with EmbeddingServiceAsyncClient(base_url=base_url, port=port) as client:
+        # Check health
+        health = await client.health()
+        print("Service health:", health)
 
-            # Request embeddings for a list of texts
-            texts = ["hello world", "test embedding"]
-            try:
-                result = await client.cmd("embed", params={"texts": texts})
-                vectors = result["result"]
-                print(f"Embeddings for {len(texts)} texts:")
-                for i, vec in enumerate(vectors):
-                    print(f"  Text: {texts[i]!r}\n  Vector: {vec[:5]}... (total {len(vec)} dims)")
-            except EmbeddingServiceAPIError as e:
-                print("[API error]", e.error)
-            except EmbeddingServiceHTTPError as e:
-                print(f"[HTTP error] {e.status}: {e.message}")
-            except EmbeddingServiceConnectionError as e:
-                print("[Connection error]", e)
-            except EmbeddingServiceError as e:
-                print("[Other error]", e)
+        # Request embeddings for a list of texts
+        texts = ["hello world", "test embedding"]
+        result = await client.cmd("embed", params={"texts": texts})
+        
+        if "error" in result:
+            print(f"Error occurred: {result['error']}")
+            if "lang" in result:
+                print(f"Language: {result['lang']}")
+            if "text" in result:
+                print(f"Text: {result['text']}")
+        else:
+            vectors = result["result"]
+            print(f"Embeddings for {len(texts)} texts:")
+            for i, vec in enumerate(vectors):
+                print(f"  Text: {texts[i]!r}\n  Vector: {vec[:5]}... (total {len(vec)} dims)")
 
-            # Example: error handling for invalid command
-            try:
-                await client.cmd("not_a_command")
-            except EmbeddingServiceAPIError as e:
-                print("[API error for invalid command]", e.error)
+        # Example: error handling for invalid command
+        result = await client.cmd("health")
+        print("Health check result:", result)
 
-            # Example: error handling for empty texts
-            try:
-                await client.cmd("embed", params={"texts": []})
-            except EmbeddingServiceAPIError as e:
-                print("[API error for empty texts]", e.error)
-
-    except Exception as e:
-        print("[Unexpected error]", e)
+        # Example: error handling for empty command
+        # result = await client.cmd("")
+        # if "error" in result:
+        #     print(f"Error for empty command: {result['error']}")
 
 if __name__ == "__main__":
     asyncio.run(main()) 

{embed_client-0.0.1.dist-info → embed_client-1.0.0.1.dist-info}/METADATA

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

embed_client-1.0.0.1.dist-info/RECORD

@@ -0,0 +1,8 @@
+embed_client/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
+embed_client/async_client.py,sha256=sppZ8fPr4XNNLE3M6kLFTL6u5HE3nqo87bxAgt0S0zE,10589
+embed_client/example_async_usage.py,sha256=df0RRwq2FtqVSL2MHVclfVIJj1wyQUuKZXB-lyVb3Kg,2538
+embed_client/example_async_usage_ru.py,sha256=kZXQcbEFkx9tWXoCq-AoyvvUY4aCuW1XqPVb1ADWeAM,3558
+embed_client-1.0.0.1.dist-info/METADATA,sha256=nFDbLecEwcLOuqhJe84hSdboS9vCEhmmX-Ajw9LYark,254
+embed_client-1.0.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+embed_client-1.0.0.1.dist-info/top_level.txt,sha256=uG00A4d9o9DFrhiN7goObpeig72Pniby0E7UpDRgyXY,13
+embed_client-1.0.0.1.dist-info/RECORD,,

{embed_client-0.0.1.dist-info → embed_client-1.0.0.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

embed_client-0.0.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-embed_client/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
-embed_client/async_client.py,sha256=HzvJ85Qh8fT-YHuam4YFW5Kbxx2hrbsOV8EzjbQ34Eg,7329
-embed_client/example_async_usage.py,sha256=7j9Hro7-TjsKVC2vHUX2J1_-Rh3V9FxsOmsCdCV8KYM,3555
-embed_client/example_async_usage_ru.py,sha256=kZXQcbEFkx9tWXoCq-AoyvvUY4aCuW1XqPVb1ADWeAM,3558
-embed_client-0.0.1.dist-info/METADATA,sha256=GUuiN2owdcnNa7XqqZeEJo_G9oV8Z7ZoqcNUtn-Cuyo,252
-embed_client-0.0.1.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-embed_client-0.0.1.dist-info/top_level.txt,sha256=uG00A4d9o9DFrhiN7goObpeig72Pniby0E7UpDRgyXY,13
-embed_client-0.0.1.dist-info/RECORD,,