Release 0.8.0b7

Author: fern-api[bot]

.gitignore

@@ -2,3 +2,4 @@ dist/
 .mypy_cache/
 __pycache__/
 poetry.toml
+.ruff_cache/

README.md

@@ -154,8 +154,8 @@ A request is deemed retriable when any of the following HTTP status codes is ret
 Use the `max_retries` request option to configure this behavior.
 
 ```python
-client.prompts.log(...,{
-    max_retries=1
+client.prompts.log(..., {
+    "max_retries": 1
 })
 ```
 
@@ -167,12 +167,15 @@ The SDK defaults to a 60 second timeout. You can configure this with a timeout o
 
 from humanloop import Humanloop
 
-client = Humanloop(..., { timeout=20.0 }, )
+client = Humanloop(
+    ...,
+    timeout=20.0,
+)
 
 
 # Override timeout for a specific method
-client.prompts.log(...,{
-    timeout_in_seconds=1
+client.prompts.log(..., {
+    "timeout_in_seconds": 1
 })
 ```
 
@@ -186,7 +189,7 @@ from humanloop import Humanloop
 
 client = Humanloop(
     ...,
-    http_client=httpx.Client(
+    httpx_client=httpx.Client(
         proxies="http://my.test.proxy.example.com",
         transport=httpx.HTTPTransport(local_address="0.0.0.0"),
     ),

poetry.lock

@@ -43,6 +43,7 @@ pytest = "^7.4.0"
 pytest-asyncio = "^0.23.5"
 python-dateutil = "^2.9.0"
 types-python-dateutil = "^2.9.0.20240316"
+ruff = "^0.5.6"
 
 [tool.pytest.ini_options]
 testpaths = [ "tests" ]
@@ -51,6 +52,9 @@ asyncio_mode = "auto"
 [tool.mypy]
 plugins = ["pydantic.mypy"]
 
+[tool.ruff]
+line-length = 120
+
 
 [build-system]
 requires = ["poetry-core"]

pyproject.toml

@@ -242,15 +242,15 @@ Controls how the model uses tools. The following options are supported:
 <dl>
 <dd>
 
-**provider_request:** `typing.Optional[typing.Dict[str, typing.Any]]` — Raw request sent to provider.
+**provider_request:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]` — Raw request sent to provider.
 
 </dd>
 </dl>
 
 <dl>
 <dd>
 
-**provider_response:** `typing.Optional[typing.Dict[str, typing.Any]]` — Raw response received the provider.
+**provider_response:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]` — Raw response received the provider.
 
 </dd>
 </dl>
@@ -274,7 +274,7 @@ Controls how the model uses tools. The following options are supported:
 <dl>
 <dd>
 
-**inputs:** `typing.Optional[typing.Dict[str, typing.Any]]` — The inputs passed to the prompt template.
+**inputs:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]` — The inputs passed to the prompt template.
 
 </dd>
 </dl>
@@ -290,7 +290,7 @@ Controls how the model uses tools. The following options are supported:
 <dl>
 <dd>
 
-**metadata:** `typing.Optional[typing.Dict[str, typing.Any]]` — Any additional metadata to record.
+**metadata:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]` — Any additional metadata to record.
 
 </dd>
 </dl>
@@ -492,7 +492,7 @@ Controls how the model uses tools. The following options are supported:
 <dl>
 <dd>
 
-**inputs:** `typing.Optional[typing.Dict[str, typing.Any]]` — The inputs passed to the prompt template.
+**inputs:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]` — The inputs passed to the prompt template.
 
 </dd>
 </dl>
@@ -508,7 +508,7 @@ Controls how the model uses tools. The following options are supported:
 <dl>
 <dd>
 
-**metadata:** `typing.Optional[typing.Dict[str, typing.Any]]` — Any additional metadata to record.
+**metadata:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]` — Any additional metadata to record.
 
 </dd>
 </dl>
@@ -901,7 +901,7 @@ client.prompts.upsert(
 <dl>
 <dd>
 
-**other:** `typing.Optional[typing.Dict[str, typing.Any]]` — Other parameter values to be passed to the provider call.
+**other:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]` — Other parameter values to be passed to the provider call.
 
 </dd>
 </dl>
@@ -1868,15 +1868,15 @@ client.tools.log(
 <dl>
 <dd>
 
-**provider_request:** `typing.Optional[typing.Dict[str, typing.Any]]` — Raw request sent to provider.
+**provider_request:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]` — Raw request sent to provider.
 
 </dd>
 </dl>
 
 <dl>
 <dd>
 
-**provider_response:** `typing.Optional[typing.Dict[str, typing.Any]]` — Raw response received the provider.
+**provider_response:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]` — Raw response received the provider.
 
 </dd>
 </dl>
@@ -1900,7 +1900,7 @@ client.tools.log(
 <dl>
 <dd>
 
-**inputs:** `typing.Optional[typing.Dict[str, typing.Any]]` — The inputs passed to the prompt template.
+**inputs:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]` — The inputs passed to the prompt template.
 
 </dd>
 </dl>
@@ -1916,7 +1916,7 @@ client.tools.log(
 <dl>
 <dd>
 
-**metadata:** `typing.Optional[typing.Dict[str, typing.Any]]` — Any additional metadata to record.
+**metadata:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]` — Any additional metadata to record.
 
 </dd>
 </dl>
@@ -2197,7 +2197,7 @@ client.tools.upsert(
 <dl>
 <dd>
 
-**setup_values:** `typing.Optional[typing.Dict[str, typing.Any]]` — Values needed to setup the Tool, defined in JSON Schema format: https://json-schema.org/
+**setup_values:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]` — Values needed to setup the Tool, defined in JSON Schema format: https://json-schema.org/
 
 </dd>
 </dl>
@@ -5872,15 +5872,15 @@ client.evaluators.log(
 <dl>
 <dd>
 
-**provider_request:** `typing.Optional[typing.Dict[str, typing.Any]]` — Raw request sent to provider. Only populated for LLM Evaluator Logs.
+**provider_request:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]` — Raw request sent to provider. Only populated for LLM Evaluator Logs.
 
 </dd>
 </dl>
 
 <dl>
 <dd>
 
-**provider_response:** `typing.Optional[typing.Dict[str, typing.Any]]` — Raw response received the provider. Only populated for LLM Evaluator Logs.
+**provider_response:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]` — Raw response received the provider. Only populated for LLM Evaluator Logs.
 
 </dd>
 </dl>
@@ -5896,7 +5896,7 @@ client.evaluators.log(
 <dl>
 <dd>
 
-**inputs:** `typing.Optional[typing.Dict[str, typing.Any]]` — The inputs passed to the prompt template.
+**inputs:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]` — The inputs passed to the prompt template.
 
 </dd>
 </dl>
@@ -5912,7 +5912,7 @@ client.evaluators.log(
 <dl>
 <dd>
 
-**metadata:** `typing.Optional[typing.Dict[str, typing.Any]]` — Any additional metadata to record.
+**metadata:** `typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]]` — Any additional metadata to record.
 
 </dd>
 </dl>

reference.md

@@ -1,20 +1,26 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import os
 import typing
-
+from .environment import HumanloopEnvironment
+import os
 import httpx
-
 from .core.api_error import ApiError
-from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
-from .datasets.client import AsyncDatasetsClient, DatasetsClient
-from .environment import HumanloopEnvironment
-from .evaluations.client import AsyncEvaluationsClient, EvaluationsClient
-from .evaluators.client import AsyncEvaluatorsClient, EvaluatorsClient
-from .logs.client import AsyncLogsClient, LogsClient
-from .prompts.client import AsyncPromptsClient, PromptsClient
-from .sessions.client import AsyncSessionsClient, SessionsClient
-from .tools.client import AsyncToolsClient, ToolsClient
+from .core.client_wrapper import SyncClientWrapper
+from .prompts.client import PromptsClient
+from .tools.client import ToolsClient
+from .datasets.client import DatasetsClient
+from .evaluations.client import EvaluationsClient
+from .evaluators.client import EvaluatorsClient
+from .logs.client import LogsClient
+from .sessions.client import SessionsClient
+from .core.client_wrapper import AsyncClientWrapper
+from .prompts.client import AsyncPromptsClient
+from .tools.client import AsyncToolsClient
+from .datasets.client import AsyncDatasetsClient
+from .evaluations.client import AsyncEvaluationsClient
+from .evaluators.client import AsyncEvaluatorsClient
+from .logs.client import AsyncLogsClient
+from .sessions.client import AsyncSessionsClient
 
 
 class Humanloop:
@@ -62,7 +68,7 @@ def __init__(
         api_key: typing.Optional[str] = os.getenv("HUMANLOOP_API_KEY"),
         timeout: typing.Optional[float] = None,
         follow_redirects: typing.Optional[bool] = True,
-        httpx_client: typing.Optional[httpx.Client] = None
+        httpx_client: typing.Optional[httpx.Client] = None,
     ):
         _defaulted_timeout = timeout if timeout is not None else 60 if httpx_client is None else None
         if api_key is None:
@@ -133,7 +139,7 @@ def __init__(
         api_key: typing.Optional[str] = os.getenv("HUMANLOOP_API_KEY"),
         timeout: typing.Optional[float] = None,
         follow_redirects: typing.Optional[bool] = True,
-        httpx_client: typing.Optional[httpx.AsyncClient] = None
+        httpx_client: typing.Optional[httpx.AsyncClient] = None,
     ):
         _defaulted_timeout = timeout if timeout is not None else 60 if httpx_client is None else None
         if api_key is None:

src/humanloop/client.py

@@ -11,7 +11,6 @@
     IS_PYDANTIC_V2,
     UniversalBaseModel,
     UniversalRootModel,
-    deep_union_pydantic_dicts,
     parse_obj_as,
     universal_field_validator,
     universal_root_validator,
@@ -43,7 +42,6 @@
     "construct_type",
     "convert_and_respect_annotation_metadata",
     "convert_file_dict_to_httpx_tuples",
-    "deep_union_pydantic_dicts",
     "encode_query",
     "jsonable_encoder",
     "parse_obj_as",

src/humanloop/core/__init__.py

@@ -1,10 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-
 import httpx
-
-from .http_client import AsyncHttpClient, HttpClient
+from .http_client import HttpClient
+from .http_client import AsyncHttpClient
 
 
 class BaseClientWrapper:

src/humanloop/core/client_wrapper.py

@@ -13,12 +13,17 @@
     # (filename, file (or bytes), content_type)
     typing.Tuple[typing.Optional[str], FileContent, typing.Optional[str]],
     # (filename, file (or bytes), content_type, headers)
-    typing.Tuple[typing.Optional[str], FileContent, typing.Optional[str], typing.Mapping[str, str]],
+    typing.Tuple[
+        typing.Optional[str],
+        FileContent,
+        typing.Optional[str],
+        typing.Mapping[str, str],
+    ],
 ]
 
 
 def convert_file_dict_to_httpx_tuples(
-    d: typing.Dict[str, typing.Union[File, typing.List[File]]]
+    d: typing.Dict[str, typing.Union[File, typing.List[File]]],
 ) -> typing.List[typing.Tuple[str, File]]:
     """
     The format we use is a list of tuples, where the first element is the

src/humanloop/core/file.py

@@ -90,7 +90,8 @@ def _should_retry(response: httpx.Response) -> bool:
 
 
 def remove_omit_from_dict(
-    original: typing.Dict[str, typing.Optional[typing.Any]], omit: typing.Optional[typing.Any]
+    original: typing.Dict[str, typing.Optional[typing.Any]],
+    omit: typing.Optional[typing.Any],
 ) -> typing.Dict[str, typing.Any]:
     if omit is None:
         return original
@@ -142,7 +143,8 @@ def get_request_body(
         # If both data and json are None, we send json data in the event extra properties are specified
         json_body = maybe_filter_request_body(json, request_options, omit)
 
-    return json_body, data_body
+    # If you have an empty JSON body, you should just send None
+    return (json_body if json_body != {} else None), data_body if data_body != {} else None
 
 
 class HttpClient: