gpu-server-setup 0.4.9__tar.gz → 0.4.10__tar.gz

{gpu_server_setup-0.4.9 → gpu_server_setup-0.4.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gpu-server-setup
-Version: 0.4.9
+Version: 0.4.10
 Summary: Один клик — удалённый GPU-сервер с Ollama + VS Code Remote
 Author: The Fool
 License: MIT

{gpu_server_setup-0.4.9 → gpu_server_setup-0.4.10}/gpu_server_setup.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gpu-server-setup
-Version: 0.4.9
+Version: 0.4.10
 Summary: Один клик — удалённый GPU-сервер с Ollama + VS Code Remote
 Author: The Fool
 License: MIT

{gpu_server_setup-0.4.9 → gpu_server_setup-0.4.10}/gpu_setup/cli.py

@@ -17,6 +17,7 @@ app = typer.Typer(
 @app.command()
 def plan(
     ip: str = typer.Option(..., "--ip", help="IP-адрес сервера"),
+    port: int = typer.Option(22, "--port", help="SSH порт (по умолчанию 22)"),
     user: str = typer.Option(..., "--user", help="Имя пользователя"),
     model: Optional[str] = typer.Option(None, "--model", help="Модель Ollama"),
     install_ollama: bool = typer.Option(True, "--install-ollama/--no-install"),
@@ -31,6 +32,7 @@ def plan(
     server = GPUServer(
         ip=ip,
         user=user,
+        port=port,
         dry_run=True,
         external_key=pem_key,   
     )
@@ -43,6 +45,7 @@ def plan(
 def setup(
     ip: str = typer.Option(..., "--ip", help="IP-адрес сервера"),
     user: str = typer.Option(..., "--user", help="Имя пользователя"),
+    port: int = typer.Option(22, "--port", help="SSH порт (по умолчанию 22)"),
     password: Optional[str] = typer.Option(
         None,
         "--password",
@@ -65,6 +68,7 @@ def setup(
         plan(
             ip=ip,
             user=user,
+            port=port,
             model=model,
             install_ollama=install_ollama,
             no_vscode=no_vscode,
@@ -75,6 +79,7 @@ def setup(
     server = GPUServer(
         ip=ip,
         user=user,
+        port=port,
         password=password,
         key_type=key_type,
         external_key=pem_key,
@@ -104,6 +109,7 @@ def setup(
 def ssh(
     ip: str = typer.Option(..., "--ip", help="IP-адрес сервера"),
     user: str = typer.Option(..., "--user", help="Имя пользователя"),
+    port: int = typer.Option(22, "--port", help="SSH порт (по умолчанию 22)"),
     password: Optional[str] = typer.Option(
         None,
         "--password",
@@ -121,6 +127,7 @@ def ssh(
 ):
     server = GPUServer(
         ip=ip,
+        port=port,
         user=user,
         password=password,
         key_type=key_type,
@@ -137,6 +144,7 @@ def ssh(
 @app.command("ollama-install")
 def ollama_install(
     ip: str = typer.Option(..., "--ip"),
+    port: int = typer.Option(22, "--port", help="SSH порт (по умолчанию 22)"),
     user: str = typer.Option(..., "--user"),
     password: Optional[str] = typer.Option(
         None,
@@ -155,6 +163,7 @@ def ollama_install(
     server = GPUServer(
         ip=ip,
         user=user,
+        port=port,
         password=password,
         external_key=pem_key,
         dry_run=dry_run,
@@ -166,6 +175,7 @@ def ollama_install(
 def model_pull(
     model: str = typer.Argument(..., help="Название модели (llama3.2, gemma2 и т.д.)"),
     ip: str = typer.Option(..., "--ip"),
+    port: int = typer.Option(22, "--port", help="SSH порт (по умолчанию 22)"),
     user: str = typer.Option(..., "--user"),
     password: Optional[str] = typer.Option(None, "--password", hide_input=True),
     dry_run: bool = typer.Option(False, "--dry-run"),
@@ -179,6 +189,7 @@ def model_pull(
     server = GPUServer(
         ip=ip,
         user=user,
+        port=port,
         password=password,
         external_key=pem_key,
         dry_run=dry_run,
@@ -189,6 +200,7 @@ def model_pull(
 @app.command()
 def vscode(
     ip: str = typer.Option(..., "--ip"),
+    port: int = typer.Option(22, "--port", help="SSH порт (по умолчанию 22)"),
     user: str = typer.Option(..., "--user"),
     password: Optional[str] = typer.Option(None, "--password", hide_input=True),
     dry_run: bool = typer.Option(False, "--dry-run"),
@@ -202,6 +214,7 @@ def vscode(
     server = GPUServer(
         ip=ip,
         user=user,
+        port=port,
         password=password,
         external_key=pem_key,
         dry_run=dry_run,

{gpu_server_setup-0.4.9 → gpu_server_setup-0.4.10}/gpu_setup/core.py

@@ -19,6 +19,7 @@ class GPUServer:
         self,
         ip: str,
         user: str,
+        port: int = 22,
         password: Optional[str] = None,
         key_type: str = "ed25519",
         external_key: Optional[str] = None,
@@ -26,6 +27,7 @@ class GPUServer:
     ):
         self.ip = ip
         self.user = user
+        self.port = port
         self.password = password
         self.dry_run = dry_run
         self.key_type = key_type
@@ -46,33 +48,23 @@ class GPUServer:
         client = SSHClient()
         client.set_missing_host_key_policy(AutoAddPolicy())
 
+        connect_kwargs = {
+            "hostname": self.ip,
+            "port": self.port,
+            "username": self.user,
+            "timeout": 15,
+            "look_for_keys": False,
+            "allow_agent": False,
+        }
+
         if self.use_external_key:
-            client.connect(
-                hostname=self.ip,
-                username=self.user,
-                key_filename=str(self.key_path),
-                timeout=15,
-                look_for_keys=False,
-                allow_agent=False,
-            )
+            connect_kwargs["key_filename"] = str(self.key_path)
         elif use_password and self.password:
-            client.connect(
-                hostname=self.ip,
-                username=self.user,
-                password=self.password,
-                timeout=15,
-                look_for_keys=False,
-                allow_agent=False,
-            )
+            connect_kwargs["password"] = self.password
         else:
-            client.connect(
-                hostname=self.ip,
-                username=self.user,
-                key_filename=str(self.key_path),
-                timeout=15,
-                look_for_keys=False,
-                allow_agent=False,
-            )
+            connect_kwargs["key_filename"] = str(self.key_path)
+
+        client.connect(**connect_kwargs)
         return client
     
     def _sudo_stream(self, client: SSHClient, cmd: str):

{gpu_server_setup-0.4.9 → gpu_server_setup-0.4.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "gpu-server-setup"
-version = "0.4.9"
+version = "0.4.10"
 description = "Один клик — удалённый GPU-сервер с Ollama + VS Code Remote"
 readme = "README.md"
 license = {text = "MIT"}