together 1.2.3__tar.gz → 1.2.5__tar.gz

{together-1.2.3 → together-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: together
-Version: 1.2.3
+Version: 1.2.5
 Summary: Python client for Together's Cloud Platform!
 Home-page: https://github.com/togethercomputer/together-python
 License: Apache-2.0

{together-1.2.3 → together-1.2.5}/pyproject.toml

@@ -12,7 +12,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "together"
-version = "1.2.3"
+version = "1.2.5"
 authors = [
     "Together AI <support@together.ai>"
 ]
@@ -50,7 +50,7 @@ optional = true
 
 [tool.poetry.group.quality.dependencies]
 black = ">=23.1,<25.0"
-ruff = ">=0.3.2,<0.6.0"
+ruff = ">=0.3.2,<0.5.0"
 types-tqdm = "^4.65.0.0"
 types-tabulate = "^0.9.0.3"
 pre-commit = "3.5.0"

{together-1.2.3 → together-1.2.5}/src/together/__init__.py

@@ -16,6 +16,12 @@ from together import (
 )
 from together.version import VERSION
 
+from together.legacy.complete import AsyncComplete, Complete, Completion
+from together.legacy.embeddings import Embeddings
+from together.legacy.files import Files
+from together.legacy.finetune import Finetune
+from together.legacy.images import Image
+from together.legacy.models import Models
 
 version = VERSION
 
@@ -37,12 +43,6 @@ from together.client import AsyncClient, AsyncTogether, Client, Together
 api_key: str | None = None  # To be deprecated in the next major release
 
 # Legacy functions
-from together.legacy.complete import AsyncComplete, Complete, Completion
-from together.legacy.embeddings import Embeddings
-from together.legacy.files import Files
-from together.legacy.finetune import Finetune
-from together.legacy.images import Image
-from together.legacy.models import Models
 
 
 __all__ = [
@@ -61,4 +61,12 @@ __all__ = [
     "together_response",
     "client",
     "utils",
+    "Complete",
+    "AsyncComplete",
+    "Completion",
+    "Embeddings",
+    "Files",
+    "Finetune",
+    "Image",
+    "Models",
 ]

{together-1.2.3 → together-1.2.5}/src/together/abstract/api_requestor.py

@@ -121,7 +121,7 @@ class APIRequestor:
         See also
             https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After#syntax
         """
-        if response_headers is None:
+        if not response_headers:
             return None
 
         # First, try the non-standard `retry-after-ms` header for milliseconds,
@@ -485,6 +485,8 @@ class APIRequestor:
             _thread_context.session.close()
             _thread_context.session = _make_session(MAX_CONNECTION_RETRIES)
             _thread_context.session_create_time = time.time()
+
+        result = None
         try:
             result = _thread_context.session.request(
                 options.method,
@@ -500,11 +502,13 @@ class APIRequestor:
         except requests.exceptions.Timeout as e:
             utils.log_debug("Encountered requests.exceptions.Timeout")
 
+            result_headers = dict(result.headers) if result is not None else {}
+
             if remaining_retries > 0:
                 return self._retry_request(
                     options,
                     remaining_retries=remaining_retries,
-                    response_headers=dict(result.headers),
+                    response_headers=result_headers,
                     stream=stream,
                     request_timeout=request_timeout,
                 )
@@ -513,11 +517,13 @@ class APIRequestor:
         except requests.exceptions.RequestException as e:
             utils.log_debug("Encountered requests.exceptions.RequestException")
 
+            result_headers = dict(result.headers) if result is not None else {}
+
             if remaining_retries > 0:
                 return self._retry_request(
                     options,
                     remaining_retries=remaining_retries,
-                    response_headers=dict(result.headers),
+                    response_headers=result_headers,
                     stream=stream,
                     request_timeout=request_timeout,
                 )
@@ -527,26 +533,32 @@ class APIRequestor:
             ) from e
 
         # retry on 5XX error or rate-limit
-        if 500 <= result.status_code < 600 or result.status_code == 429:
-            utils.log_debug(
-                f"Encountered requests.exceptions.HTTPError. Error code: {result.status_code}"
-            )
-
-            if remaining_retries > 0:
-                return self._retry_request(
-                    options,
-                    remaining_retries=remaining_retries,
-                    response_headers=dict(result.headers),
-                    stream=stream,
-                    request_timeout=request_timeout,
+        if result is not None:
+            if 500 <= result.status_code < 600 or result.status_code == 429:
+                utils.log_debug(
+                    f"Encountered requests.exceptions.HTTPError. Error code: {result.status_code}"
                 )
 
+                result_headers = dict(result.headers) if result is not None else {}
+
+                if remaining_retries > 0:
+                    return self._retry_request(
+                        options,
+                        remaining_retries=remaining_retries,
+                        response_headers=result_headers,
+                        stream=stream,
+                        request_timeout=request_timeout,
+                    )
+
+        status_code = result.status_code if result is not None else 0
+        result_headers = dict(result.headers) if result is not None else {}
+
         utils.log_debug(
             "Together API response",
             path=abs_url,
-            response_code=result.status_code,
-            processing_ms=result.headers.get("x-total-time"),
-            request_id=result.headers.get("CF-RAY"),
+            response_code=status_code,
+            processing_ms=result_headers.get("x-total-time"),
+            request_id=result_headers.get("CF-RAY"),
         )
 
         return result  # type: ignore

{together-1.2.3 → together-1.2.5}/src/together/cli/api/chat.py

@@ -238,7 +238,7 @@ def chat(
             assert chunk.choices
 
             if raw:
-                click.echo(f"{json.dumps(chunk.model_dump())}")
+                click.echo(f"{json.dumps(chunk.model_dump(exclude_none=True))}")
                 continue
 
             should_print_header = len(chunk.choices) > 1
@@ -261,7 +261,9 @@ def chat(
         assert isinstance(response.choices, list)
 
         if raw:
-            click.echo(f"{json.dumps(response.model_dump(), indent=4)}")
+            click.echo(
+                f"{json.dumps(response.model_dump(exclude_none=True), indent=4)}"
+            )
             return
 
         should_print_header = len(response.choices) > 1

{together-1.2.3 → together-1.2.5}/src/together/cli/api/completions.py

@@ -80,7 +80,7 @@ def completions(
             assert chunk.choices
 
             if raw:
-                click.echo(f"{json.dumps(chunk.model_dump())}")
+                click.echo(f"{json.dumps(chunk.model_dump(exclude_none=True))}")
                 continue
 
             should_print_header = len(chunk.choices) > 1
@@ -104,7 +104,9 @@ def completions(
         assert isinstance(response.choices, list)
 
         if raw:
-            click.echo(f"{json.dumps(response.model_dump(), indent=4)}")
+            click.echo(
+                f"{json.dumps(response.model_dump(exclude_none=True), indent=4)}"
+            )
             return
 
         should_print_header = len(response.choices) > 1

{together-1.2.3 → together-1.2.5}/src/together/cli/api/files.py

@@ -44,7 +44,7 @@ def upload(ctx: click.Context, file: pathlib.Path, purpose: str, check: bool) ->
 
     response = client.files.upload(file=file, purpose=purpose, check=check)
 
-    click.echo(json.dumps(response.model_dump(), indent=4))
+    click.echo(json.dumps(response.model_dump(exclude_none=True), indent=4))
 
 
 @files.command()
@@ -83,7 +83,7 @@ def retrieve(ctx: click.Context, id: str) -> None:
 
     response = client.files.retrieve(id=id)
 
-    click.echo(json.dumps(response.model_dump(), indent=4))
+    click.echo(json.dumps(response.model_dump(exclude_none=True), indent=4))
 
 
 @files.command()
@@ -97,7 +97,7 @@ def retrieve_content(ctx: click.Context, id: str, output: str) -> None:
 
     response = client.files.retrieve_content(id=id, output=output)
 
-    click.echo(json.dumps(response.model_dump(), indent=4))
+    click.echo(json.dumps(response.model_dump(exclude_none=True), indent=4))
 
 
 @files.command()
@@ -110,7 +110,7 @@ def delete(ctx: click.Context, id: str) -> None:
 
     response = client.files.delete(id=id)
 
-    click.echo(json.dumps(response.model_dump(), indent=4))
+    click.echo(json.dumps(response.model_dump(exclude_none=True), indent=4))
 
 
 @files.command()

{together-1.2.3 → together-1.2.5}/src/together/cli/api/finetune.py

@@ -97,7 +97,7 @@ def create(
         wandb_api_key=wandb_api_key,
     )
 
-    click.echo(json.dumps(response.model_dump(), indent=4))
+    click.echo(json.dumps(response.model_dump(exclude_none=True), indent=4))
 
 
 @fine_tuning.command()
@@ -142,7 +142,7 @@ def retrieve(ctx: click.Context, fine_tune_id: str) -> None:
     # remove events from response for cleaner output
     response.events = None
 
-    click.echo(json.dumps(response.model_dump(), indent=4))
+    click.echo(json.dumps(response.model_dump(exclude_none=True), indent=4))
 
 
 @fine_tuning.command()
@@ -164,7 +164,7 @@ def cancel(ctx: click.Context, fine_tune_id: str, quiet: bool = False) -> None:
             return
     response = client.fine_tuning.cancel(fine_tune_id)
 
-    click.echo(json.dumps(response.model_dump(), indent=4))
+    click.echo(json.dumps(response.model_dump(exclude_none=True), indent=4))
 
 
 @fine_tuning.command()
@@ -223,4 +223,4 @@ def download(
         fine_tune_id, output=output_dir, checkpoint_step=checkpoint_step
     )
 
-    click.echo(json.dumps(response.model_dump(), indent=4))
+    click.echo(json.dumps(response.model_dump(exclude_none=True), indent=4))

{together-1.2.3 → together-1.2.5}/src/together/error.py

@@ -19,7 +19,7 @@ class TogetherException(Exception):
         http_status: int | None = None,
     ) -> None:
         _message = (
-            json.dumps(message.model_dump())
+            json.dumps(message.model_dump(exclude_none=True))
             if isinstance(message, TogetherErrorResponse)
             else message
         )

{together-1.2.3 → together-1.2.5}/src/together/legacy/complete.py

@@ -25,9 +25,11 @@ class Complete:
 
         client = together.Together(api_key=api_key)
 
-        return client.completions.create(
-            prompt=prompt, stream=False, **kwargs
-        ).model_dump()  # type: ignore
+        result = client.completions.create(prompt=prompt, stream=False, **kwargs)
+
+        assert isinstance(result, CompletionResponse)
+
+        return result.model_dump(exclude_none=True)
 
     @classmethod
     @deprecated  # type: ignore
@@ -46,7 +48,7 @@ class Complete:
         client = together.Together(api_key=api_key)
 
         return (
-            token.model_dump()  # type: ignore
+            token.model_dump(exclude_none=True)  # type: ignore
             for token in client.completions.create(prompt=prompt, stream=True, **kwargs)
         )
 

{together-1.2.3 → together-1.2.5}/src/together/legacy/embeddings.py

@@ -22,4 +22,6 @@ class Embeddings:
 
         client = together.Together(api_key=api_key)
 
-        return client.embeddings.create(input=input, **kwargs).model_dump()
+        return client.embeddings.create(input=input, **kwargs).model_dump(
+            exclude_none=True
+        )

{together-1.2.3 → together-1.2.5}/src/together/legacy/files.py

@@ -24,7 +24,7 @@ class Files:
 
         client = together.Together(api_key=api_key)
 
-        return client.files.list().model_dump()
+        return client.files.list().model_dump(exclude_none=True)
 
     @classmethod
     def check(self, file: str) -> Dict[str, object]:
@@ -54,7 +54,9 @@ class Files:
         client = together.Together(api_key=api_key)
 
         # disabling the check, because it was run previously
-        response = client.files.upload(file=file, check=False).model_dump()
+        response = client.files.upload(file=file, check=False).model_dump(
+            exclude_none=True
+        )
 
         if check:
             response["report_dict"] = report_dict
@@ -76,7 +78,7 @@ class Files:
 
         client = together.Together(api_key=api_key)
 
-        return client.files.delete(id=file_id).model_dump()
+        return client.files.delete(id=file_id).model_dump(exclude_none=True)
 
     @classmethod
     @deprecated  # type: ignore
@@ -93,7 +95,7 @@ class Files:
 
         client = together.Together(api_key=api_key)
 
-        return client.files.retrieve(id=file_id).model_dump()
+        return client.files.retrieve(id=file_id).model_dump(exclude_none=True)
 
     @classmethod
     @deprecated  # type: ignore
@@ -111,7 +113,9 @@ class Files:
 
         client = together.Together(api_key=api_key)
 
-        return client.files.retrieve_content(id=file_id, output=output).model_dump()
+        return client.files.retrieve_content(id=file_id, output=output).dict(
+            exclude_none=True
+        )
 
     @classmethod
     @deprecated  # type: ignore

{together-1.2.3 → together-1.2.5}/src/together/legacy/finetune.py

@@ -47,7 +47,7 @@ class Finetune:
             learning_rate=learning_rate,
             suffix=suffix,
             wandb_api_key=wandb_api_key,
-        ).model_dump()
+        ).model_dump(exclude_none=True)
 
     @classmethod
     @deprecated  # type: ignore
@@ -63,7 +63,7 @@ class Finetune:
 
         client = together.Together(api_key=api_key)
 
-        return client.fine_tuning.list().model_dump()
+        return client.fine_tuning.list().model_dump(exclude_none=True)
 
     @classmethod
     @deprecated  # type: ignore
@@ -80,7 +80,9 @@ class Finetune:
 
         client = together.Together(api_key=api_key)
 
-        return client.fine_tuning.retrieve(id=fine_tune_id).model_dump()
+        return client.fine_tuning.retrieve(id=fine_tune_id).model_dump(
+            exclude_none=True
+        )
 
     @classmethod
     @deprecated  # type: ignore
@@ -97,7 +99,7 @@ class Finetune:
 
         client = together.Together(api_key=api_key)
 
-        return client.fine_tuning.cancel(id=fine_tune_id).model_dump()
+        return client.fine_tuning.cancel(id=fine_tune_id).model_dump(exclude_none=True)
 
     @classmethod
     @deprecated  # type: ignore
@@ -114,7 +116,9 @@ class Finetune:
 
         client = together.Together(api_key=api_key)
 
-        return client.fine_tuning.list_events(id=fine_tune_id).model_dump()
+        return client.fine_tuning.list_events(id=fine_tune_id).model_dump(
+            exclude_none=True
+        )
 
     @classmethod
     @deprecated  # type: ignore
@@ -170,4 +174,4 @@ class Finetune:
 
         return client.fine_tuning.download(
             id=fine_tune_id, output=output, checkpoint_step=step
-        ).model_dump()
+        ).model_dump(exclude_none=True)

{together-1.2.3 → together-1.2.5}/src/together/legacy/images.py

@@ -22,4 +22,6 @@ class Image:
 
         client = together.Together(api_key=api_key)
 
-        return client.images.generate(prompt=prompt, **kwargs).model_dump()
+        return client.images.generate(prompt=prompt, **kwargs).model_dump(
+            exclude_none=True
+        )

{together-1.2.3 → together-1.2.5}/src/together/legacy/models.py

@@ -20,7 +20,7 @@ class Models:
 
         client = together.Together(api_key=api_key)
 
-        return [item.model_dump() for item in client.models.list()]
+        return [item.model_dump(exclude_none=True) for item in client.models.list()]
 
     @classmethod
     @deprecated  # type: ignore
@@ -41,4 +41,4 @@ class Models:
 
         for item in model_list:
             if item.id == model:
-                return item.model_dump()
+                return item.model_dump(exclude_none=True)

{together-1.2.3 → together-1.2.5}/src/together/resources/chat/completions.py

@@ -131,7 +131,7 @@ class ChatCompletions:
             response_format=response_format,
             tools=tools,
             tool_choice=tool_choice,
-        ).model_dump()
+        ).model_dump(exclude_none=True)
 
         response, _, _ = requestor.request(
             options=TogetherRequest(
@@ -268,7 +268,7 @@ class AsyncChatCompletions:
             response_format=response_format,
             tools=tools,
             tool_choice=tool_choice,
-        ).model_dump()
+        ).model_dump(exclude_none=True)
 
         response, _, _ = await requestor.arequest(
             options=TogetherRequest(

{together-1.2.3 → together-1.2.5}/src/together/resources/completions.py

@@ -113,7 +113,7 @@ class Completions:
             echo=echo,
             n=n,
             safety_model=safety_model,
-        ).model_dump()
+        ).model_dump(exclude_none=True)
 
         response, _, _ = requestor.request(
             options=TogetherRequest(
@@ -232,7 +232,7 @@ class AsyncCompletions:
             echo=echo,
             n=n,
             safety_model=safety_model,
-        ).model_dump()
+        ).model_dump(exclude_none=True)
 
         response, _, _ = await requestor.arequest(
             options=TogetherRequest(

{together-1.2.3 → together-1.2.5}/src/together/resources/embeddings.py

@@ -40,7 +40,7 @@ class Embeddings:
         parameter_payload = EmbeddingRequest(
             input=input,
             model=model,
-        ).model_dump()
+        ).model_dump(exclude_none=True)
 
         response, _, _ = requestor.request(
             options=TogetherRequest(
@@ -84,7 +84,7 @@ class AsyncEmbeddings:
         parameter_payload = EmbeddingRequest(
             input=input,
             model=model,
-        ).model_dump()
+        ).model_dump(exclude_none=True)
 
         response, _, _ = await requestor.arequest(
             options=TogetherRequest(

{together-1.2.3 → together-1.2.5}/src/together/resources/finetune.py

@@ -90,7 +90,7 @@ class FineTuning:
             training_type=training_type,
             suffix=suffix,
             wandb_key=wandb_api_key,
-        ).model_dump()
+        ).model_dump(exclude_none=True)
 
         response, _, _ = requestor.request(
             options=TogetherRequest(
@@ -304,7 +304,7 @@ class AsyncFineTuning:
             learning_rate=learning_rate,
             suffix=suffix,
             wandb_key=wandb_api_key,
-        ).model_dump()
+        ).model_dump(exclude_none=True)
 
         response, _, _ = await requestor.arequest(
             options=TogetherRequest(

{together-1.2.3 → together-1.2.5}/src/together/resources/images.py

@@ -67,7 +67,7 @@ class Images:
             height=height,
             width=width,
             negative_prompt=negative_prompt,
-        ).model_dump()
+        ).model_dump(exclude_none=True)
 
         response, _, _ = requestor.request(
             options=TogetherRequest(
@@ -140,7 +140,7 @@ class AsyncImages:
             height=height,
             width=width,
             negative_prompt=negative_prompt,
-        ).model_dump()
+        ).model_dump(exclude_none=True)
 
         response, _, _ = await requestor.arequest(
             options=TogetherRequest(

{together-1.2.3 → together-1.2.5}/src/together/types/chat_completions.py

@@ -4,7 +4,7 @@ import warnings
 from enum import Enum
 from typing import Any, Dict, List
 
-from pydantic import Field, model_validator
+from pydantic import model_validator
 from typing_extensions import Self
 
 from together.types.abstract import BaseModel
@@ -48,7 +48,10 @@ class ChatCompletionMessage(BaseModel):
 
 class ResponseFormat(BaseModel):
     type: ResponseFormatType
-    schema_: Dict[str, Any] | None = Field(None, alias="schema")
+    schema_: Dict[str, Any] | None = None
+
+    def to_dict(self) -> Dict[str, Any]:
+        return {"schema": self.schema_, "type": self.type}
 
 
 class FunctionTool(BaseModel):

together-1.2.3/src/together/abstract/__init__.py

@@ -1 +0,0 @@
-from together.abstract.api_requestor import APIRequestor