Merge pull request #197 from Datura-ai/main

deploy - validator 3.4.1

neurons/executor/.env.template

@@ -1,7 +1,8 @@
-INTERNAL_PORT=8001
-EXTERNAL_PORT=8001
+INTERNAL_PORT=8001 # interal port of docker
+EXTERNAL_PORT=8001 # external port of docker
 
-SSH_PORT=2200
+SSH_PORT=2200 # external ssh port of docker map into 22
+SSH_PUBLIC_PORT=2200 # Optional. in case you are using proxy and public port is different from internal port in your server
 
 # NOTE: please use either RENTING_PORT_RANGE or RENTING_PORT_MAPPINGS, both are not allowed
 # Note: If you are not using proxy and all ports are available publicly,

neurons/executor/Dockerfile

@@ -53,6 +53,6 @@ RUN mkdir -p /etc/docker
 RUN mkdir -p /etc/nvidia-container-runtime
 RUN mkdir -p /root/.ssh
 
-LABEL version="3.3.2"
+LABEL version="3.3.3"
 
 CMD ["bash", "run.sh"]

neurons/executor/Dockerfile.runner

@@ -6,6 +6,6 @@ COPY entrypoint.sh /entrypoint.sh
 
 RUN chmod u+x /entrypoint.sh
 
-LABEL version="3.3.2"
+LABEL version="3.3.3"
 
 ENTRYPOINT ["/entrypoint.sh"]

neurons/executor/README.md

@@ -47,7 +47,8 @@ You can change the ports for `INTERNAL_PORT`, `EXTERNAL_PORT`, `SSH_PORT` based
 
 - **INTERNAL_PORT**: internal port of your executor docker container
 - **EXTERNAL_PORT**: external expose port of your executor docker container
-- **SSH_PORT**: ssh access port of your executor docker container
+- **SSH_PORT**: ssh port map into 22 of your executor docker container
+- **SSH_PUBLIC_PORT**: [Optional] ssh public access port of your executor docker container. If `SSH_PUBLIC_PORT` is equal to `SSH_PORT` then you don't have to specify this port.
 - **MINER_HOTKEY_SS58_ADDRESS**: the miner hotkey address
 - **RENTING_PORT_RANGE**: The port range that are publicly accessible. This can be empty if all ports are open. Available formats are: 
   - Range Specification(`from-to`): Miners can specify a range of ports, such as 2000-2005. This means ports from 2000 to 2005 will be open for the validator to select.

neurons/executor/src/core/config.py

@@ -8,7 +8,8 @@ class Settings(BaseSettings):
     PROJECT_NAME: str = "compute-subnet-executor"
 
     INTERNAL_PORT: int = Field(env="INTERNAL_PORT", default=8001)
-    SSH_PORT: int = Field(env="SSH_PORT", default=22)
+    SSH_PORT: int = Field(env="SSH_PORT", default=2200)
+    SSH_PUBLIC_PORT: Optional[int] = Field(env="SSH_PUBLIC_PORT", default=None)
 
     MINER_HOTKEY_SS58_ADDRESS: str = Field(env="MINER_HOTKEY_SS58_ADDRESS")
 

neurons/executor/src/services/miner_service.py

@@ -26,7 +26,7 @@ async def upload_ssh_key(self, paylod: MinerAuthPayload):
 
         return {
             "ssh_username": self.ssh_service.get_current_os_user(),
-            "ssh_port": settings.SSH_PORT,
+            "ssh_port": settings.SSH_PUBLIC_PORT or settings.SSH_PORT,
             "python_path": sys.executable,
             "root_dir": str(Path(__file__).resolve().parents[2]),
             "port_range": settings.RENTING_PORT_RANGE,

neurons/validators/Dockerfile

@@ -47,6 +47,6 @@ RUN echo "export PYTHONPATH=$PYTHONPATH" >> ~/.bash_profile
 COPY --from=base-image /root/app/ /root/app/
 COPY --from=base-image /opt/pypackages/ /opt/pypackages/
 
-LABEL version="3.4.0"
+LABEL version="3.4.1"
 
 CMD ["bash", "run.sh"]

neurons/validators/Dockerfile.runner

@@ -3,7 +3,7 @@ WORKDIR /root/validator
 COPY docker-compose.app.yml docker-compose.yml
 COPY entrypoint.sh /entrypoint.sh
 
-LABEL version="3.4.0"
+LABEL version="3.4.1"
 
 RUN chmod u+x /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

neurons/validators/src/services/task_service.py

@@ -105,7 +105,7 @@ async def is_script_running(
 
     async def start_script(
         self,
-        ssh_client,
+        ssh_client: asyncssh.SSHClientConnection,
         script_path: str,
         command_args: dict,
         executor_info: ExecutorSSHInfo,
@@ -124,6 +124,7 @@ async def start_script(
         try:
             # Build command string from arguments
             args_string = " ".join([f"--{key} {value}" for key, value in command_args.items()])
+            await ssh_client.run("pip install aiohttp click pynvml psutil", timeout=30)
             command = (
                 f"nohup {executor_info.python_path} {script_path} {args_string} > /dev/null 2>&1 & "
             )