Merge branch 'main' into mitali/add-avzone-de

Author: atihkin

poetry.lock

@@ -12,7 +12,7 @@ build-backend = "poetry.masonry.api"
 
 [tool.poetry]
 name = "together"
-version = "1.5.26"
+version = "1.5.30"
 authors = ["Together AI <[email protected]>"]
 description = "Python client for Together's Cloud Platform!"
 readme = "README.md"
@@ -43,6 +43,7 @@ numpy = [
     { version = ">=1.26.0", python = ">=3.12" },
 ]
 pillow = "^11.1.0"
+black = "^25.9.0"
 
 [tool.poetry.extras]
 pyarrow = ["pyarrow"]

pyproject.toml

@@ -345,13 +345,30 @@ def delete(client: Together, endpoint_id: str) -> None:
     type=click.Choice(["dedicated", "serverless"]),
     help="Filter by endpoint type",
 )
+@click.option(
+    "--mine",
+    type=click.BOOL,
+    default=None,
+    help="true (only mine), default=all",
+)
+@click.option(
+    "--usage-type",
+    type=click.Choice(["on-demand", "reserved"]),
+    help="Filter by endpoint usage type",
+)
 @click.pass_obj
 @handle_api_errors
 def list(
-    client: Together, json: bool, type: Literal["dedicated", "serverless"] | None
+    client: Together,
+    json: bool,
+    type: Literal["dedicated", "serverless"] | None,
+    usage_type: Literal["on-demand", "reserved"] | None,
+    mine: bool | None,
 ) -> None:
     """List all inference endpoints (includes both dedicated and serverless endpoints)."""
-    endpoints: List[ListEndpoint] = client.endpoints.list(type=type)
+    endpoints: List[ListEndpoint] = client.endpoints.list(
+        type=type, usage_type=usage_type, mine=mine
+    )
 
     if not endpoints:
         click.echo("No dedicated endpoints found", err=True)

src/together/cli/api/endpoints.py

@@ -26,6 +26,7 @@ class Together:
     batches: resources.Batches
     code_interpreter: CodeInterpreter
     evaluation: resources.Evaluation
+    videos: resources.Videos
 
     # client options
     client: TogetherClient
@@ -94,6 +95,7 @@ def __init__(
         self.code_interpreter = CodeInterpreter(self.client)
         self.batches = resources.Batches(self.client)
         self.evaluation = resources.Evaluation(self.client)
+        self.videos = resources.Videos(self.client)
 
 
 class AsyncTogether:
@@ -109,6 +111,7 @@ class AsyncTogether:
     code_interpreter: CodeInterpreter
     batches: resources.AsyncBatches
     evaluation: resources.AsyncEvaluation
+    videos: resources.AsyncVideos
     # client options
     client: TogetherClient
 
@@ -175,6 +178,7 @@ def __init__(
         self.code_interpreter = CodeInterpreter(self.client)
         self.batches = resources.AsyncBatches(self.client)
         self.evaluation = resources.AsyncEvaluation(self.client)
+        self.videos = resources.AsyncVideos(self.client)
 
 
 Client = Together

src/together/client.py

@@ -10,6 +10,7 @@
 from together.resources.rerank import AsyncRerank, Rerank
 from together.resources.batch import Batches, AsyncBatches
 from together.resources.evaluation import Evaluation, AsyncEvaluation
+from together.resources.videos import AsyncVideos, Videos
 
 
 __all__ = [
@@ -37,4 +38,6 @@
     "AsyncBatches",
     "Evaluation",
     "AsyncEvaluation",
+    "AsyncVideos",
+    "Videos",
 ]

src/together/resources/__init__.py

@@ -13,13 +13,18 @@ def __init__(self, client: TogetherClient) -> None:
         self._client = client
 
     def list(
-        self, type: Optional[Literal["dedicated", "serverless"]] = None
+        self,
+        type: Optional[Literal["dedicated", "serverless"]] = None,
+        usage_type: Optional[Literal["on-demand", "reserved"]] = None,
+        mine: Optional[bool] = None,
     ) -> List[ListEndpoint]:
         """
-        List all endpoints, can be filtered by type.
+        List all endpoints, can be filtered by endpoint type and ownership.
 
         Args:
-            type (str, optional): Filter endpoints by type ("dedicated" or "serverless"). Defaults to None.
+            type (str, optional): Filter endpoints by endpoint type ("dedicated" or "serverless"). Defaults to None.
+            usage_type (str, optional): Filter endpoints by usage type ("on-demand" or "reserved"). Defaults to None.
+            mine (bool, optional): If True, return only endpoints owned by the caller. Defaults to None.
 
         Returns:
             List[ListEndpoint]: List of endpoint objects
@@ -28,9 +33,20 @@ def list(
             client=self._client,
         )
 
-        params = {}
+        params: Dict[
+            str,
+            Union[
+                Literal["dedicated", "serverless"],
+                Literal["on-demand", "reserved"],
+                bool,
+            ],
+        ] = {}
         if type is not None:
             params["type"] = type
+        if usage_type is not None:
+            params["usage_type"] = usage_type
+        if mine is not None:
+            params["mine"] = mine
 
         response, _, _ = requestor.request(
             options=TogetherRequest(
@@ -293,13 +309,18 @@ def __init__(self, client: TogetherClient) -> None:
         self._client = client
 
     async def list(
-        self, type: Optional[Literal["dedicated", "serverless"]] = None
+        self,
+        type: Optional[Literal["dedicated", "serverless"]] = None,
+        usage_type: Optional[Literal["on-demand", "reserved"]] = None,
+        mine: Optional[bool] = None,
     ) -> List[ListEndpoint]:
         """
-        List all endpoints, can be filtered by type.
+        List all endpoints, can be filtered by type and ownership.
 
         Args:
             type (str, optional): Filter endpoints by type ("dedicated" or "serverless"). Defaults to None.
+            usage_type (str, optional): Filter endpoints by usage type ("on-demand" or "reserved"). Defaults to None.
+            mine (bool, optional): If True, return only endpoints owned by the caller. Defaults to None.
 
         Returns:
             List[ListEndpoint]: List of endpoint objects
@@ -308,9 +329,20 @@ async def list(
             client=self._client,
         )
 
-        params = {}
+        params: Dict[
+            str,
+            Union[
+                Literal["dedicated", "serverless"],
+                Literal["on-demand", "reserved"],
+                bool,
+            ],
+        ] = {}
         if type is not None:
             params["type"] = type
+        if usage_type is not None:
+            params["usage_type"] = usage_type
+        if mine is not None:
+            params["mine"] = mine
 
         response, _, _ = await requestor.arequest(
             options=TogetherRequest(

src/together/resources/endpoints.py

@@ -21,7 +21,6 @@ def generate(
         *,
         prompt: str,
         model: str,
-        steps: int | None = 20,
         seed: int | None = None,
         n: int | None = 1,
         height: int | None = 1024,
@@ -37,8 +36,6 @@ def generate(
 
             model (str, optional): The model to use for image generation.
 
-            steps (int, optional): Number of generation steps. Defaults to 20
-
             seed (int, optional): Seed used for generation. Can be used to reproduce image generations.
                 Defaults to None.
 
@@ -51,7 +48,8 @@ def generate(
             negative_prompt (str, optional): The prompt or prompts not to guide the image generation.
                 Defaults to None
 
-            image_base64: (str, optional): Reference image used for generation. Defaults to None.
+            **kwargs: Additional parameters like steps (int, optional): Number of generation steps,
+                image_base64 (str, optional): Reference image used for generation, etc.
 
         Returns:
             ImageResponse: Object containing image data
@@ -64,7 +62,6 @@ def generate(
         parameter_payload = ImageRequest(
             prompt=prompt,
             model=model,
-            steps=steps,
             seed=seed,
             n=n,
             height=height,
@@ -96,7 +93,6 @@ async def generate(
         *,
         prompt: str,
         model: str,
-        steps: int | None = 20,
         seed: int | None = None,
         n: int | None = 1,
         height: int | None = 1024,
@@ -112,8 +108,6 @@ async def generate(
 
             model (str, optional): The model to use for image generation.
 
-            steps (int, optional): Number of generation steps. Defaults to 20
-
             seed (int, optional): Seed used for generation. Can be used to reproduce image generations.
                 Defaults to None.
 
@@ -126,7 +120,8 @@ async def generate(
             negative_prompt (str, optional): The prompt or prompts not to guide the image generation.
                 Defaults to None
 
-            image_base64: (str, optional): Reference image used for generation. Defaults to None.
+            **kwargs: Additional parameters like steps (int, optional): Number of generation steps,
+                image_base64 (str, optional): Reference image used for generation, etc.
 
         Returns:
             ImageResponse: Object containing image data
@@ -139,7 +134,6 @@ async def generate(
         parameter_payload = ImageRequest(
             prompt=prompt,
             model=model,
-            steps=steps,
             seed=seed,
             n=n,
             height=height,