feat: add dedicated endpoint cli

Author: CompuIves

.devcontainer/devcontainer.json

@@ -5,6 +5,11 @@
     },
     "features": {
         "ghcr.io/devcontainers/features/git:1": {},
+        "ghcr.io/devcontainers/features/java:1": {
+            "version": "17",
+            "installMaven": false,
+            "installGradle": false
+        },
         "ghcr.io/devcontainers-contrib/features/poetry:2": {}
     },
     "customizations": {

.gitignore

@@ -27,6 +27,9 @@ share/python-wheels/
 *.egg
 MANIFEST
 
+# OpenAPI Generator Ignore
+src/together/generated/
+
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.

poetry.lock

@@ -39,12 +39,15 @@ aiohttp = "^3.9.3"
 filelock = "^3.13.1"
 eval-type-backport = ">=0.1.3,<0.3.0"
 click = "^8.1.7"
+python-dateutil = "^2.8.2"
 pillow = "^10.3.0"
 pyarrow = ">=10.0.1"
+makefun = "^1.15.2"
 numpy = [
     { version = ">=1.23.5", python = "<3.12" },
     { version = ">=1.26.0", python = ">=3.12" },
 ]
+aiohttp-retry = "^2.9.1"
 
 [tool.poetry.group.quality]
 optional = true
@@ -81,7 +84,6 @@ optional = true
 [tool.poetry.group.dev.dependencies]
 mypy = "^1.14.1"
 types-requests = "^2.31.0"
-openapi-python-client = "^0.19.0"
 
 [tool.poetry.urls]
 "Homepage" = "https://github.com/togethercomputer/together-python"

pyproject.toml

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

scripts/.gitignore

@@ -1,34 +1,29 @@
 #!/usr/bin/env python3
 from __future__ import annotations
 
+import shutil
 import subprocess
 import sys
 from pathlib import Path
 
-import requests
 
-
-OPENAPI_SPEC_URL = (
-    "https://raw.githubusercontent.com/togethercomputer/openapi/refs/heads/main/openapi.yaml"
-)
+OPENAPI_SPEC_URL = "https://raw.githubusercontent.com/togethercomputer/openapi/main/openapi.yaml"
 OUTPUT_DIR = Path(__file__).parent.parent / "src" / "together" / "generated"
-GENERATOR_JAR_URL = "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.3.0/openapi-generator-cli-7.3.0.jar"
+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:
+    """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 if it doesn't exist."""
-    if target.exists():
-        return
+    """Download a file"""
 
     print(f"Downloading {url} to {target}")
-    response = requests.get(url, stream=True)
-    response.raise_for_status()
-
-    target.parent.mkdir(parents=True, exist_ok=True)
-    with open(target, "wb") as f:
-        for chunk in response.iter_content(chunk_size=8192):
-            f.write(chunk)
+    run_command(["wget", "-O", str(target), url])
 
 
 def main() -> None:
@@ -39,6 +34,9 @@ def main() -> None:
     # Download generator if needed
     download_file(GENERATOR_JAR_URL, GENERATOR_JAR)
 
+    # Delete existing generated code
+    shutil.rmtree(OUTPUT_DIR, ignore_errors=True)
+
     # Ensure output directory exists
     OUTPUT_DIR.mkdir(parents=True, exist_ok=True)
 
@@ -54,19 +52,32 @@ def main() -> None:
         "python",
         "-o",
         str(OUTPUT_DIR),
-        "--additional-properties=packageName=together.generated",
+        "--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...")
-    result = subprocess.run(cmd, capture_output=True, text=True)
+    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)
 
+    # Move files from nested directory to target directory
+    nested_dir = OUTPUT_DIR / "together" / "generated"
+    if nested_dir.exists():
+        print("Moving files from nested directory...")
+        # Move all contents to parent directory
+        for item in nested_dir.iterdir():
+            shutil.move(str(item), str(OUTPUT_DIR / item.name))
+        # Clean up empty directories
+        shutil.rmtree(OUTPUT_DIR / "together", ignore_errors=True)
+
     print("Successfully generated client code")