Merge branch 'main' into mabraham/eng-29561

Author: fdrose

src/together/client.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/resources/__init__.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/images.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,