Fixing mypy issues and bumping version

Author: harry-rhesis

CHANGELOG.md

@@ -25,6 +25,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added base entity for CRUD testing
 - Added topic tests
 
+## [0.1.3] - 2025-02-19
+
+### Added
+- Added new test set capabilities
+- Added PromptSynthesizer for generating test sets from prompts
+- Added example usage for PromptSynthesizer
+
 [0.1.0]: https://github.com/username/repository/releases/tag/v0.1.0
 [0.1.1]: https://github.com/username/repository/releases/tag/v0.1.1
 [0.1.2]: https://github.com/username/repository/releases/tag/v0.1.2
+[0.1.3]: https://github.com/username/repository/releases/tag/v0.1.3

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rhesis-sdk"
-version = "0.1.2"
+version = "0.1.3"
 description = "SDK for testing and validating LLM applications"
 authors = ["Engineering Team <engineering@rhesis.ai>", "Harry Cruz <harry@rhesis.ai>", "Nicolai Bohn <nicolai@rhesis.ai>"]
 license = "MIT"
@@ -62,6 +62,7 @@ requests = "^2.31.0"
 pyarrow = ">=17.0.0"
 tiktoken = "^0.9.0"
 tqdm = "^4.67.1"
+types-tqdm = "^4.67.0.20241221"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

pyproject.toml

@@ -5,7 +5,7 @@ babel==2.16.0 ; python_version <= "3.11" and python_version >= "3.10" or python_
 certifi==2024.12.14 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 cffi==1.17.1 ; python_version <= "3.11" and implementation_name == "pypy" and python_version >= "3.10" or python_version >= "3.12" and implementation_name == "pypy"
 charset-normalizer==3.4.1 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
-colorama==0.4.6 ; python_version <= "3.11" and sys_platform == "win32" and python_version >= "3.10" or python_version >= "3.12" and sys_platform == "win32"
+colorama==0.4.6 ; python_version <= "3.11" and sys_platform == "win32" and python_version >= "3.10" or python_version <= "3.11" and platform_system == "Windows" and python_version >= "3.10" or python_version >= "3.12" and sys_platform == "win32" or python_version >= "3.12" and platform_system == "Windows"
 comm==0.2.2 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 debugpy==1.8.12 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 decorator==5.1.1 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
@@ -44,6 +44,7 @@ python-dateutil==2.9.0.post0 ; python_version <= "3.11" and python_version >= "3
 python-dotenv==1.0.1 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 pywin32==308 ; python_version <= "3.11" and sys_platform == "win32" and platform_python_implementation != "PyPy" and python_version >= "3.10" or python_version >= "3.12" and sys_platform == "win32" and platform_python_implementation != "PyPy"
 pyzmq==26.2.0 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
+regex==2024.11.6 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 requests==2.32.3 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 six==1.17.0 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 snowballstemmer==2.2.0 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
@@ -58,11 +59,14 @@ sphinxcontrib-jsmath==1.0.1 ; python_version <= "3.11" and python_version >= "3.
 sphinxcontrib-qthelp==2.0.0 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 sphinxcontrib-serializinghtml==2.0.0 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 stack-data==0.6.3 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
+tiktoken==0.9.0 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 tomli==2.2.1 ; python_version >= "3.10" and python_version < "3.11"
 tornado==6.4.2 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
+tqdm==4.67.1 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 traitlets==5.14.3 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 types-pytz==2024.2.0.20241221 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 types-requests==2.32.0.20241016 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
+types-tqdm==4.67.0.20241221 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 typing-extensions==4.12.2 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 urllib3==2.3.0 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 wcwidth==0.2.13 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"

requirements-dev.txt

@@ -3,7 +3,7 @@ asttokens==3.0.0 ; python_version <= "3.11" and python_version >= "3.10" or pyth
 certifi==2024.12.14 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 cffi==1.17.1 ; python_version <= "3.11" and implementation_name == "pypy" and python_version >= "3.10" or python_version >= "3.12" and implementation_name == "pypy"
 charset-normalizer==3.4.1 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
-colorama==0.4.6 ; python_version <= "3.11" and sys_platform == "win32" and python_version >= "3.10" or python_version >= "3.12" and sys_platform == "win32"
+colorama==0.4.6 ; python_version <= "3.11" and sys_platform == "win32" and python_version >= "3.10" or python_version <= "3.11" and platform_system == "Windows" and python_version >= "3.10" or python_version >= "3.12" and sys_platform == "win32" or python_version >= "3.12" and platform_system == "Windows"
 comm==0.2.2 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 debugpy==1.8.12 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 decorator==5.1.1 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
@@ -32,10 +32,15 @@ python-dateutil==2.9.0.post0 ; python_version <= "3.11" and python_version >= "3
 python-dotenv==1.0.1 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 pywin32==308 ; python_version <= "3.11" and sys_platform == "win32" and platform_python_implementation != "PyPy" and python_version >= "3.10" or python_version >= "3.12" and sys_platform == "win32" and platform_python_implementation != "PyPy"
 pyzmq==26.2.0 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
+regex==2024.11.6 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 requests==2.32.3 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 six==1.17.0 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 stack-data==0.6.3 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
+tiktoken==0.9.0 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 tornado==6.4.2 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
+tqdm==4.67.1 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 traitlets==5.14.3 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
+types-requests==2.32.0.20241016 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
+types-tqdm==4.67.0.20241221 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 urllib3==2.3.0 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"
 wcwidth==0.2.13 ; python_version <= "3.11" and python_version >= "3.10" or python_version >= "3.12"

requirements.txt

@@ -1,6 +1,6 @@
 import functools
 import requests
-from typing import Optional, Dict, Any, Callable, TypeVar, cast, Type
+from typing import Optional, Dict, Any, Callable, TypeVar, cast
 from rhesis.client import Client
 from datetime import datetime
 import logging
@@ -12,19 +12,28 @@
 
 def handle_http_errors(func: Callable[..., T]) -> Callable[..., Optional[T]]:
     """Decorator to handle HTTP errors in API requests."""
+
     @functools.wraps(func)
-    def wrapper(self_or_cls, *args: Any, **kwargs: Any) -> Optional[T]:
+    def wrapper(self_or_cls: Any, *args: Any, **kwargs: Any) -> Optional[T]:
         try:
             return func(self_or_cls, *args, **kwargs)
         except requests.exceptions.HTTPError as e:
             logger.error(f"HTTP error occurred: {e}")
-            logger.error(f"Response content: {e.response.content.decode()}")
+            # Handle potential string or bytes content
+            content = e.response.content
+            if isinstance(content, bytes):
+                content = content.decode()
+            logger.error(f"Response content: {content}")
             logger.error(f"Request URL: {e.response.request.url}")
             logger.error(f"Request method: {e.response.request.method}")
             logger.error(f"Request headers: {e.response.request.headers}")
             if e.response.request.body:
-                logger.error(f"Request body: {e.response.request.body.decode()}")
+                body = e.response.request.body
+                if isinstance(body, bytes):
+                    body = body.decode()
+                logger.error(f"Request body: {body}")
             return None
+
     return wrapper
 
 
@@ -59,35 +68,29 @@ def __init__(self, **fields: Any) -> None:
     def save(self) -> Optional[Dict[str, Any]]:
         """Save the entity to the database."""
         try:
-            # Use all fields except 'id' for the request body
-            data = {k: v for k, v in self.fields.items() if k != 'id'}
-            
+            data = {k: v for k, v in self.fields.items() if k != "id"}
+
             if "id" in self.fields:
-                # Update existing entity
                 url = f"{self.client.get_url(self.endpoint)}/{self.fields['id']}/"
                 try:
                     response = requests.put(
                         url,
                         json=data,
                         headers=self.headers,
                     )
-                    if response.status_code == 200:
-                        return response.json()
                     response.raise_for_status()
+                    return dict(response.json())
                 except requests.exceptions.RequestException:
                     raise
             else:
-                # Create new entity
                 url = f"{self.client.get_url(self.endpoint)}/"
                 response = requests.post(
                     url,
                     json=data,
                     headers=self.headers,
                 )
-                if response.status_code == 200:
-                    return response.json()
                 response.raise_for_status()
-            return None
+                return dict(response.json())
         except requests.exceptions.HTTPError:
             return None
 
@@ -150,7 +153,7 @@ def all(cls, **kwargs: Any) -> Optional[list[Any]]:
             "Content-Type": "application/json",
         }
         url = f"{client.get_url(cls.endpoint)}/"
-        
+
         try:
             response = requests.get(
                 url,
@@ -165,7 +168,7 @@ def all(cls, **kwargs: Any) -> Optional[list[Any]]:
             response.raise_for_status()
         except requests.exceptions.RequestException:
             raise
-        
+
         return None
 
     @handle_http_errors
@@ -206,10 +209,10 @@ def get_by_id(cls, id: str) -> Dict[str, Any]:
         entity_dict = cls.fields.get(id)
         if entity_dict is None:
             raise ValueError(
-                f"Cannot get {cls.__name__}: "
+                f"Cannot get {cls.__class__.__name__}: "
                 f"entity with id {id} does not exist in database"
             )
-        return cast(Dict[str, Any], entity_dict)
+        return dict(entity_dict)
 
     def _validate_update(self) -> None:
         """Validate entity before update."""