feat: dedicated endpoint cli commands

.devcontainer/Dockerfile

@@ -0,0 +1,8 @@
+FROM mcr.microsoft.com/devcontainers/python:3.9
+
+ENV PYTHONUNBUFFERED 1
+
+RUN pipx install poetry==1.8.3
+
+# Install pre-commit
+RUN pip install pre-commit

.devcontainer/devcontainer.json

@@ -0,0 +1,40 @@
+{
+    "name": "Together Python Development",
+    "build": {
+        "dockerfile": "Dockerfile"
+    },
+    "features": {
+        "ghcr.io/devcontainers/features/git:1": {},
+        "ghcr.io/devcontainers/features/node:1": {},
+        "ghcr.io/devcontainers/features/java:1": {
+            "version": "17",
+            "installMaven": false,
+            "installGradle": false
+        }
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-python.python",
+                "ms-python.vscode-pylance",
+                "ms-python.isort",
+                "charliermarsh.ruff",
+                "ms-python.mypy-type-checker",
+                "eamodio.gitlens"
+            ],
+            "settings": {
+                "[python]": {
+                    "editor.defaultFormatter": "charliermarsh.ruff"
+                },
+                "editor.formatOnSave": true,
+                "editor.codeActionsOnSave": {
+                    "source.fixAll": "explicit",
+                    "source.organizeImports": "explicit"
+                },
+                "ruff.lineLength": 100
+            }
+        }
+    },
+    "postCreateCommand": "poetry install",
+    "remoteUser": "vscode"
+}

.github/workflows/_integration_tests.yml

@@ -24,7 +24,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"

.github/workflows/_tests.yml

@@ -24,7 +24,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"

.github/workflows/upload-to-pypi.yml

@@ -27,6 +27,10 @@ jobs:
         path: .venv
         key: venv-${{ matrix.python-version }}-${{ hashFiles('pyproject.toml') }}-${{ hashFiles('poetry.lock') }}
 
+    - name: Generate OpenAPI client
+      run: |
+        make generate-client-from-existing-spec
+
     - name: Install dependencies
       run: |
         poetry config virtualenvs.in-project true

Makefile

@@ -1,4 +1,4 @@
-.PHONY: all format lint test tests test_watch integration_tests docker_tests help extended_tests
+.PHONY: all format lint test tests test_watch integration_tests docker_tests help extended_tests generate-client
 
 # Default target executed when no arguments are given to make.
 all: help
@@ -27,10 +27,18 @@ integration_tests:
 install:
 	poetry install --with quality,tests
 	poetry run pre-commit install
+	$(MAKE) generate-client
 
 format:
 	poetry run pre-commit run --all-files
 
+# OpenAPI Client Generation
+
+generate-client:
+	python scripts/generate_api_client.py
+
+generate-client-from-existing-spec:
+	python scripts/generate_api_client.py --skip-spec-download
 
 # Documentation
 
@@ -49,3 +57,4 @@ help:
 	@echo 'test_watch                   - run unit tests in watch mode'
 	@echo 'extended_tests               - run extended tests'
 	@echo 'integration_tests            - run integration tests'
+	@echo 'generate-client              - generate the OpenAPI client'

mypy.ini

@@ -1,2 +1,9 @@
 [mypy]
 plugins = pydantic.mypy
+disallow_untyped_defs = true
+
+[mypy-together.generated.*]
+ignore_errors = true
+
+[mypy.tests.*]
+ignore_errors = true

pyproject.toml

@@ -26,6 +26,9 @@ classifiers = [
 ]
 repository = "https://github.com/togethercomputer/together-python"
 homepage = "https://github.com/togethercomputer/together-python"
+packages = [
+    { include = "together", from = "src" },
+]
 
 [tool.poetry.dependencies]
 python = "^3.9"
@@ -40,10 +43,12 @@ filelock = "^3.13.1"
 eval-type-backport = ">=0.1.3,<0.3.0"
 click = "^8.1.7"
 pyarrow = ">=10.0.1"
+python-dateutil = "^2.8.2"
 numpy = [
     { version = ">=1.23.5", python = "<3.12" },
     { version = ">=1.26.0", python = ">=3.12" },
 ]
+aiohttp-retry = "^2.9.1"
 pillow = "^11.1.0"
 
 [tool.poetry.group.quality]
@@ -75,6 +80,7 @@ datasets = ">=2.18,<4.0"
 transformers = "^4.39.3"
 
 
+
 [tool.poetry.urls]
 "Homepage" = "https://github.com/togethercomputer/together-python"
 "Bug Tracker" = "https://github.com/togethercomputer/together-python/issues"

scripts/.gitignore

@@ -0,0 +1 @@
+openapi-generator-cli.jar

scripts/generate_api_client.py

@@ -0,0 +1,109 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+import argparse
+import shutil
+import subprocess
+import sys
+import tempfile
+from pathlib import Path
+
+
+OPENAPI_SPEC_URL = (
+    "https://raw.githubusercontent.com/togethercomputer/openapi/main/openapi.yaml"
+)
+# We no longer set OUTPUT_DIR to the src folder for generation.
+# Instead, we'll copy the generated client to the target directory.
+TARGET_DIR = Path(__file__).parent.parent / "src" / "together" / "generated"
+GENERATOR_JAR_URL = "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.11.0/openapi-generator-cli-7.11.0.jar"
+GENERATOR_JAR = Path(__file__).parent / "openapi-generator-cli.jar"
+
+
+def run_command(cmd: list[str], check: bool = True) -> subprocess.CompletedProcess[str]:
+    """Run a command and optionally check its return code."""
+    print(f"Running: {' '.join(cmd)}")
+    return subprocess.run(cmd, check=check, capture_output=True, text=True)
+
+
+def download_file(url: str, target: Path) -> None:
+    """Download a file."""
+    print(f"Downloading {url} to {target}")
+    run_command(["wget", "-O", str(target), url])
+
+
+def parse_args() -> argparse.Namespace:
+    """Parse command line arguments."""
+    parser = argparse.ArgumentParser(description="Generate Together API client")
+    parser.add_argument(
+        "--skip-spec-download",
+        action="store_true",
+        help="Skip downloading the OpenAPI spec file",
+    )
+    return parser.parse_args()
+
+
+def main() -> None:
+    args = parse_args()
+    spec_file = Path(__file__).parent / "openapi.yaml"
+
+    # Download OpenAPI spec if not skipped.
+    if not args.skip_spec_download:
+        download_file(OPENAPI_SPEC_URL, spec_file)
+        # Format the spec for better merge conflict handling.
+        run_command(["npx", "-y", "prettier", "--write", str(spec_file)])
+    elif not spec_file.exists():
+        print(
+            "Error: OpenAPI spec file not found and download was skipped",
+            file=sys.stderr,
+        )
+        sys.exit(1)
+
+    # Download generator if needed.
+    download_file(GENERATOR_JAR_URL, GENERATOR_JAR)
+
+    # Create a temporary directory for generation.
+    with tempfile.TemporaryDirectory() as tmp_dir:
+        tmp_path = Path(tmp_dir)
+        # Build the generation command.
+        cmd = [
+            "java",
+            "-jar",
+            str(GENERATOR_JAR),
+            "generate",
+            "-i",
+            str(spec_file),
+            "-g",
+            "python",
+            "-o",
+            str(tmp_path),
+            "--package-name=together.generated",
+            "--git-repo-id=together-python",
+            "--git-user-id=togethercomputer",
+            "--additional-properties=packageUrl=https://github.com/togethercomputer/together-python",
+            "--additional-properties=library=asyncio",
+            "--additional-properties=generateSourceCodeOnly=true",
+        ]
+
+        print("Generating client code into temporary directory...")
+        result = run_command(cmd, check=False)
+        if result.returncode != 0:
+            print("Error generating client code:", file=sys.stderr)
+            print(result.stderr, file=sys.stderr)
+            sys.exit(1)
+
+        # The generator will create a directory structure like: tmp_dir/together/generated
+        generated_dir = tmp_path / "together" / "generated"
+        if not generated_dir.exists():
+            print("Error: Expected generated directory not found", file=sys.stderr)
+            sys.exit(1)
+
+        # Remove any existing generated client code.
+        shutil.rmtree(TARGET_DIR, ignore_errors=True)
+        TARGET_DIR.parent.mkdir(parents=True, exist_ok=True)
+        # Copy the generated code from the temporary directory to the target directory.
+        shutil.copytree(generated_dir, TARGET_DIR)
+        print("Successfully generated and copied client code to", TARGET_DIR)
+
+
+if __name__ == "__main__":
+    main()