Container improvements

Dockerfile

@@ -1,5 +1,9 @@
 FROM python:3-slim
 
+ENV SHELL_INTERACTION=false
+ENV OVERWRITE_OS_NAME=""
+ENV OVERWRITE_SHELL_NAME=""
+
 WORKDIR /app
 COPY . /app
 

README.md

@@ -461,9 +461,16 @@ docker run --rm \
        ghcr.io/ther1d/shell_gpt --chat rainbow "what are the colors of a rainbow"
 ```
 
+When using a container, please note:
+* The \[E\]xecute option for --shell with interaction will not work, since it would try this Execute in the docker container.  
+=> setting the `SHELL_INTERACTION` environment variable to false , makes sense.
+* Since, most likely the os and shell of your container are not identical to the environment you want help with:  
+set the environment variables `OVERWRITE_OS_NAME` and `OVERWRITE_SHELL_NAME` according to your setup.
+
+
 Example of a conversation, using an alias and the `OPENAI_API_KEY` environment variable:
 ```shell
-alias sgpt="docker run --rm --env OPENAI_API_KEY --volume gpt-cache:/tmp/shell_gpt ghcr.io/ther1d/shell_gpt"
+alias sgpt="docker run --rm --env OPENAI_API_KEY --env SHELL_INTERACTION=false OVERWRITE_OS_NAME=Debian --env OVERWRITE_SHELL_NAME=bash --volume gpt-cache:/tmp/shell_gpt ghcr.io/ther1d/shell_gpt"
 export OPENAI_API_KEY="your OPENAI API key"
 sgpt --chat rainbow "what are the colors of a rainbow"
 sgpt --chat rainbow "inverse the list of your last answer"
@@ -475,4 +482,13 @@ You also can use the provided `Dockerfile` to build your own image:
 docker build -t sgpt .
 ```
 
+Example environment variables for a working Ollama setup, using Docker:
+* ENV DEFAULT_MODEL=ollama/mistral:7b-instruct-v0.2-q4_K_M
+* ENV API_BASE_URL=http://10.10.10.10:11434
+* ENV USE_LITELLM=true
+* ENV OPENAI_API_KEY=bad_key
+* ENV SHELL_INTERACTION=false
+* ENV OVERWRITE_OS_NAME="Linux/Red Hat Enterprise Linux 8.8 (Ootpa)"
+* ENV OVERWRITE_SHELL_NAME=/bin/bash
+
 Additional documentation: [Azure integration](https://github.com/TheR1D/shell_gpt/wiki/Azure), [Ollama integration](https://github.com/TheR1D/shell_gpt/wiki/Ollama).

sgpt/app.py

@@ -57,7 +57,7 @@ def main(
         rich_help_panel="Assistance Options",
     ),
     interaction: bool = typer.Option(
-        True,
+        True if cfg.get("SHELL_INTERACTION") != "false" else False,
         help="Interactive mode for --shell option.",
         rich_help_panel="Assistance Options",
     ),

sgpt/config.py

@@ -34,6 +34,9 @@
     "API_BASE_URL": os.getenv("API_BASE_URL", "default"),
     "PRETTIFY_MARKDOWN": os.getenv("PRETTIFY_MARKDOWN", "true"),
     "USE_LITELLM": os.getenv("USE_LITELLM", "false"),
+    "SHELL_INTERACTION ": os.getenv("SHELL_INTERACTION ", "true"),
+    "OVERWRITE_OS_NAME": os.getenv("OVERWRITE_OS_NAME", ""),
+    "OVERWRITE_SHELL_NAME ": os.getenv("OVERWRITE_SHELL_NAME", ""),
     # New features might add their own config variables here.
 }
 

sgpt/role.py

@@ -113,22 +113,28 @@ def get_role_name(cls, initial_message: str) -> Optional[str]:
 
     @classmethod
     def _os_name(cls) -> str:
-        current_platform = platform.system()
-        if current_platform == "Linux":
-            return "Linux/" + distro_name(pretty=True)
-        if current_platform == "Windows":
-            return "Windows " + platform.release()
-        if current_platform == "Darwin":
-            return "Darwin/MacOS " + platform.mac_ver()[0]
-        return current_platform
+        if cfg.get("OVERWRITE_OS_NAME") != "":
+            return cfg.get("OVERWRITE_OS_NAME")
+        else:
+            current_platform = platform.system()
+            if current_platform == "Linux":
+                return "Linux/" + distro_name(pretty=True)
+            if current_platform == "Windows":
+                return "Windows " + platform.release()
+            if current_platform == "Darwin":
+                return "Darwin/MacOS " + platform.mac_ver()[0]
+            return current_platform
 
     @classmethod
     def _shell_name(cls) -> str:
-        current_platform = platform.system()
-        if current_platform in ("Windows", "nt"):
-            is_powershell = len(getenv("PSModulePath", "").split(pathsep)) >= 3
-            return "powershell.exe" if is_powershell else "cmd.exe"
-        return basename(getenv("SHELL", "/bin/sh"))
+        if cfg.get("OVERWRITE_SHELL_NAME") != "":
+            return cfg.get("OVERWRITE_SHELL_NAME")
+        else:
+            current_platform = platform.system()
+            if current_platform in ("Windows", "nt"):
+                is_powershell = len(getenv("PSModulePath", "").split(pathsep)) >= 3
+                return "powershell.exe" if is_powershell else "cmd.exe"
+            return basename(getenv("SHELL", "/bin/sh"))
 
     @property
     def _exists(self) -> bool: