tuft 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

tuft/__main__.py

@@ -0,0 +1,7 @@
+"""Entry point for running tuft as a module: python -m tuft."""
+
+from tuft.cli import main
+
+
+if __name__ == "__main__":
+    main()

tuft/cli.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import logging
+import os
 from pathlib import Path
 
 import typer
@@ -14,34 +15,66 @@ from .telemetry import init_telemetry
 from .telemetry.metrics import ResourceMetricsCollector
 
 
-app = typer.Typer(help="TuFT - Tenant-unified Fine-Tuning Server.")
+app = typer.Typer(help="TuFT - Tenant-unified Fine-Tuning Server.", no_args_is_help=True)
+
+
+# Required for Typer to recognize subcommands when using no_args_is_help=True
+@app.callback()
+def callback() -> None:
+    """TuFT - Tenant-unified Fine-Tuning Server."""
+
+
+# Default paths based on TUFT_HOME
+_TUFT_HOME = Path(os.environ.get("TUFT_HOME", Path.home() / ".tuft"))
+_DEFAULT_CONFIG_PATH = _TUFT_HOME / "configs" / "tuft_config.yaml"
+_DEFAULT_CHECKPOINT_DIR = _TUFT_HOME / "checkpoints"
 
 _HOST_OPTION = typer.Option("127.0.0.1", "--host", help="Interface to bind", envvar="TUFT_HOST")
 _PORT_OPTION = typer.Option(10610, "--port", "-p", help="Port to bind", envvar="TUFT_PORT")
-_LOG_LEVEL_OPTION = typer.Option("info", "--log-level", help="Uvicorn log level")
+_LOG_LEVEL_OPTION = typer.Option(
+    "info", "--log-level", help="Uvicorn log level", envvar="TUFT_LOG_LEVEL"
+)
 _RELOAD_OPTION = typer.Option(False, "--reload", help="Enable auto-reload (development only)")
 _CONFIG_OPTION = typer.Option(
     None,
     "--config",
     "-c",
-    help="Path to a TuFT configuration file (YAML)",
+    help=f"Path to a TuFT configuration file (YAML). Defaults to {_DEFAULT_CONFIG_PATH}",
+    envvar="TUFT_CONFIG",
 )
 _CHECKPOINT_DIR_OPTION = typer.Option(
     None,
     "--checkpoint-dir",
-    help="Override checkpoint_dir from config file. Defaults to ~/.cache/tuft/checkpoints.",
+    help=f"Override checkpoint_dir from config file. Defaults to {_DEFAULT_CHECKPOINT_DIR}",
+    envvar="TUFT_CHECKPOINT_DIR",
 )
 
 
+def _resolve_config_path(config_path: Path | None) -> Path:
+    """Resolve the config path, falling back to default if not provided."""
+    if config_path is not None:
+        return config_path
+    if _DEFAULT_CONFIG_PATH.exists():
+        return _DEFAULT_CONFIG_PATH
+    raise typer.BadParameter(
+        f"Configuration file must be provided via --config or TUFT_CONFIG, "
+        f"or create a default config at {_DEFAULT_CONFIG_PATH}"
+    )
+
+
 def _build_config(
     config_path: Path | None,
     checkpoint_dir: Path | None,
 ) -> AppConfig:
-    if config_path is None:
-        raise typer.BadParameter("Configuration file must be provided via --config")
-    config = load_yaml_config(config_path)
+    resolved_config_path = _resolve_config_path(config_path)
+    config = load_yaml_config(resolved_config_path)
+    # Apply checkpoint_dir override, or use default if not in config
     if checkpoint_dir is not None:
         config.checkpoint_dir = checkpoint_dir.expanduser()
+    elif config.checkpoint_dir is None:
+        config.checkpoint_dir = _DEFAULT_CHECKPOINT_DIR
+    # Guarantee checkpoint_dir is set after resolution
+    assert config.checkpoint_dir is not None, "checkpoint_dir must be set after config resolution"
     config.ensure_directories()
     return config
 
@@ -84,7 +117,7 @@ def launch(
 
 
 def main() -> None:
-    app()
+    app(prog_name="tuft")
 
 
 if __name__ == "__main__":

tuft/config.py

@@ -9,8 +9,9 @@ from typing import Dict, Iterable, List
 from .persistence import PersistenceConfig
 
 
-def _default_checkpoint_dir() -> Path:
-    return Path.home() / ".cache" / "tuft" / "checkpoints"
+def _default_checkpoint_dir() -> Path | None:
+    """Return None to let CLI set the default based on TUFT_HOME."""
+    return None
 
 
 def _default_persistence_config() -> PersistenceConfig:
@@ -42,7 +43,7 @@ def _default_telemetry_config() -> TelemetryConfig:
 class AppConfig:
     """Runtime configuration for the TuFT server."""
 
-    checkpoint_dir: Path = field(default_factory=_default_checkpoint_dir)
+    checkpoint_dir: Path | None = field(default_factory=_default_checkpoint_dir)
     supported_models: List[ModelConfig] = field(default_factory=list)
     model_owner: str = "local-user"
     toy_backend_seed: int = 0
@@ -53,7 +54,8 @@ class AppConfig:
     telemetry: TelemetryConfig = field(default_factory=_default_telemetry_config)
 
     def ensure_directories(self) -> None:
-        self.checkpoint_dir.mkdir(parents=True, exist_ok=True)
+        if self.checkpoint_dir is not None:
+            self.checkpoint_dir.mkdir(parents=True, exist_ok=True)
 
     def check_validity(self) -> None:
         if not self.supported_models:

tuft/sampling_controller.py

@@ -181,8 +181,10 @@ class SamplingController:
                 if model_path:
                     # model_path should have higher priority than base_model
                     try:
+                        assert self.config.checkpoint_dir is not None
                         parsed_checkpoint = CheckpointRecord.from_tinker_path(
-                            model_path, self.config.checkpoint_dir
+                            model_path,
+                            self.config.checkpoint_dir,
                         )
                     except FileNotFoundError as exc:
                         raise CheckpointNotFoundException(checkpoint_id=model_path) from exc

tuft/training_controller.py

@@ -508,6 +508,7 @@ class TrainingController:
                 logger.info("Checkpoint save begin: %s", checkpoint_id)
 
                 setattr(training_run, counter_attr, counter + 1)
+                assert self.config.checkpoint_dir is not None
                 checkpoint = CheckpointRecord.from_training_run(
                     training_run_id=training_run.training_run_id,
                     checkpoint_name=checkpoint_name,
@@ -567,7 +568,11 @@ class TrainingController:
     ) -> None:
         """Load a checkpoint."""
         try:
-            parsed_checkpoint = CheckpointRecord.from_tinker_path(path, self.config.checkpoint_dir)
+            assert self.config.checkpoint_dir is not None
+            parsed_checkpoint = CheckpointRecord.from_tinker_path(
+                path,
+                self.config.checkpoint_dir,
+            )
         except FileNotFoundError as exc:
             raise CheckpointNotFoundException(checkpoint_id=model_id) from exc
         source_model_id = parsed_checkpoint.training_run_id or model_id

{tuft-0.1.1.dist-info → tuft-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tuft
-Version: 0.1.1
+Version: 0.1.2
 Summary: A multi-tenant fine-tuning platform for LLMs with Tinker-compatible API
 Author-email: TuFT Developers <tuft@list.alibaba-inc.com>
 License: MIT License
@@ -29,6 +29,7 @@ Requires-Python: >=3.11
 Requires-Dist: fastapi>=0.125.0
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: numpy<2.0.0
+Requires-Dist: nvidia-ml-py>=13.0.0
 Requires-Dist: omegaconf>=2.3.0
 Requires-Dist: opentelemetry-api>=1.20.0
 Requires-Dist: opentelemetry-exporter-otlp>=1.20.0
@@ -36,7 +37,6 @@ Requires-Dist: opentelemetry-instrumentation-fastapi>=0.41b0
 Requires-Dist: opentelemetry-instrumentation-logging>=0.41b0
 Requires-Dist: opentelemetry-sdk>=1.20.0
 Requires-Dist: psutil>=5.9.0
-Requires-Dist: pynvml>=11.5.0
 Requires-Dist: ray>=2.50.0
 Requires-Dist: tinker>=0.7.0
 Requires-Dist: transformers<5.0.0,>=4.57.3

{tuft-0.1.1.dist-info → tuft-0.1.2.dist-info}/RECORD

@@ -1,15 +1,16 @@
 tuft/__init__.py,sha256=BJu6iJ_QGwcJXRXDgR1LjV25KgM6sVd7_WqIXVTEuVM,97
+tuft/__main__.py,sha256=MPhC9msQXf9py5xkLPQ4JoqrvCpL_qXVwksasNUj7ig,131
 tuft/auth.py,sha256=2Wk9ATXlAiGm1Irpj66CfIyORuHzciSNAOzVwM8PeO0,1071
 tuft/backend.py,sha256=ftiaaNds2MXroszZW8l6DEq515qiw1KmrODI3x6AHE4,10254
 tuft/checkpoints.py,sha256=bObo2NzDrfzp5BiS6I_FIA3frLFic_sT4o4c-PEzfpk,6917
-tuft/cli.py,sha256=PJ89JfrJ7wB5Zd-pe9rkWLcfavmWRtWLmQ_r1Y_Qdwk,2725
-tuft/config.py,sha256=EGkDmnYNNHgtkEuffHoBE9R-hc2epAJe4sUEVBP_6Ug,4292
+tuft/cli.py,sha256=-WhmHGIHmWtL46LvXRlhTPVPhBUjZHVLJi0nYR_pqoE,4024
+tuft/config.py,sha256=bX6NuSora0Wqhk5Q5lsnc0lojeevxnLHfiijJHMdtVg,4380
 tuft/exceptions.py,sha256=_xdsL8bx3Y6jvC5VYHVCa73uAEWXxcl2YwVc09lJXFk,4088
 tuft/futures.py,sha256=0gRLgDJJQRGGmULYsKdUs3VDsrLN8QfuFfXV00kxHO4,16375
-tuft/sampling_controller.py,sha256=WIQ29aVD9JWuxZ8JV4a71nYZXh8Es2wtA4QhaaGRSXQ,15151
+tuft/sampling_controller.py,sha256=c02VQ6Qww9IQC9VJYzQO9Z9v45kK2QeaOKlknYWjSI4,15250
 tuft/server.py,sha256=NUapRGdQbQH6PbuCfMZeMVi_7vM6nM7xmxepCPkgyko,24996
 tuft/state.py,sha256=J9R5Wd9JlMtpYcaY_6t5RvgJbY3EX5ZJTZfoQhwZ9hU,12853
-tuft/training_controller.py,sha256=fQI6sxtG3v2JYgbd1y501MLzuTUAp0NIvzv6cBOm-T8,29841
+tuft/training_controller.py,sha256=V4JMgyEnf4wYGrk72AR5rHH1iYl488vt7d0c-ubTrO0,30008
 tuft/backends/__init__.py,sha256=7A6Pu-vEMbcMWapAh-zkI1O5WtBHO0OxwED8qAy9kAQ,262
 tuft/backends/base_backend.py,sha256=bdlx3hRyEj00GKFlh2fAczn7h4zANz7bdKgXb_F18y4,3462
 tuft/backends/hf_training_model.py,sha256=XQa598SpY7DnYYU0rTaHjlh-5dRCPueFtcdxrcjXWIc,16993
@@ -28,8 +29,8 @@ tuft/telemetry/__init__.py,sha256=dlSGiJ_pMElhwEe31olGg88ZrjoBeGUBn2P17qFNymM,33
 tuft/telemetry/metrics.py,sha256=Yz6s2AQ5CptFXvEm-PbO-Ib17-aF0rnoG8vZxH-Pawo,11538
 tuft/telemetry/provider.py,sha256=jGKqTMsP-WekKGCMN9QHwt-g_1Lk1xUOy1BO-__xG5I,6700
 tuft/telemetry/tracing.py,sha256=GL-wEEQtzM1ycgfI4sMsHUeIC7qj5MyOH-sBwHihbsE,957
-tuft-0.1.1.dist-info/METADATA,sha256=zH2lHrE8kZh2O61cvI7_uSyGCJ9obARa0FZGLnj0HQY,20375
-tuft-0.1.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-tuft-0.1.1.dist-info/entry_points.txt,sha256=T48zU7Vdi2ZsARDeOZ9jK6XGuYNaCbSaUTd5POouLms,39
-tuft-0.1.1.dist-info/licenses/LICENSE,sha256=fJHdoqbikZ-GATzLNmixfKDot1w_cJuHKY3mH4qSmYs,1069
-tuft-0.1.1.dist-info/RECORD,,
+tuft-0.1.2.dist-info/METADATA,sha256=UlTE_gR3cPFLzV69GyIHD6TOm-dHSmSM5NcEHt8L0Pg,20381
+tuft-0.1.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+tuft-0.1.2.dist-info/entry_points.txt,sha256=T48zU7Vdi2ZsARDeOZ9jK6XGuYNaCbSaUTd5POouLms,39
+tuft-0.1.2.dist-info/licenses/LICENSE,sha256=fJHdoqbikZ-GATzLNmixfKDot1w_cJuHKY3mH4qSmYs,1069
+tuft-0.1.2.dist-info/RECORD,,