v0.2.0

Author: azdolinski

.github/workflows/reusable-pytest.yml

@@ -40,4 +40,4 @@ jobs:
 
       - name: Run pytest with --clean
         working-directory: ./test/server
-        run: pytest --clean
+        run: bash run.sh a --clean

.gitignore

@@ -45,22 +45,27 @@ docker/data/
 docker_dev/
 specification/
 .windsurfrules
+.windsurf/
 kill.sh
 .pytest_cache/
 .vscode/
 .input
 payload.json
+.tmp/
 *.original
 *.old
 *.backup
 *.backups
 .*/                 # ignore all dot-directories
 !.github/           # but do NOT ignore .github directory
 
+
+
 # Tests
 test/server-stress-tests/
 test/mcpServer-compatibility/
 
 
 # Src
 src/webui/
+src/__*

README.md

@@ -1,16 +1,16 @@
-# MCPOSimpleServer
+# MCPoSimpleServer
 
 A Python-based LLM server that implements the Model Context Protocol (MCP).
 
-## 🤔 What is MCPOSimpleServer?
+## 🤔 What is MCPoSimpleServer?
 
-MCPOSimpleServer is a lightweight, asynchronous API platform for running and managing MCP tools in isolated, secure environments. It implements the Model Context Protocol (MCP) for seamless integration with LLM applications.
+MCPoSimpleServer is a lightweight, asynchronous API platform for running and managing MCP tools in isolated, secure environments. It implements the Model Context Protocol (MCP) for seamless integration with LLM applications.
 
 ## 📺 Demo
 
-Check out our demo video to see SimpleTool Server in action:
+Check out our demo video to see MCPoSimpleServer in action:
 
-[![SimpleTool Server Demo](https://img.youtube.com/vi/tQ6OhvC4eDQ/0.jpg)](https://www.youtube.com/watch?v=tQ6OhvC4eDQ)
+[![MCPoSimpleServer Demo](https://img.youtube.com/vi/tQ6OhvC4eDQ/0.jpg)](https://www.youtube.com/watch?v=tQ6OhvC4eDQ)
 
 ## ✨ Key Features
 

docker/Dockerfile

@@ -1,12 +1,11 @@
 FROM debian:trixie
 
 LABEL MAINTAINER="Artur Zdolinski artur@zdolinski.com"
-ARG TZ=Etc/UTC
-ARG APP_VERSION=0.0.0
+ARG TZ
 ARG USER=appuser
 ARG UID=1000
 ARG GID=100
-
+ARG APP_FOLDER=/app/mcpo_simple_server
 
 USER root
 ### Envrionment config
@@ -26,10 +25,10 @@ ENV DISPLAY=:1 \
     TERM=xterm \
     STARTUPDIR=/dockerstartup \
     DEBIAN_FRONTEND=noninteractive \
-    APP_FOLDER=/app \
-    NODE_VERSION=v23.6.0 \  
+    APP_FOLDER=${APP_FOLDER} \
     SSHD_ENABLED=true \
-    SSHD_PORT=22
+    SSHD_PORT=22 \
+    TZ=Etc/UTC
 
 WORKDIR /tmp
 
@@ -54,6 +53,7 @@ RUN apt-get update && \
     apt-utils \
     iputils-ping \
     psmisc \
+    tzdata \
     ttf-wqy-zenhei \
     fonts-liberation \
     python3-dotenv \
@@ -62,10 +62,11 @@ RUN apt-get update && \
     python3-venv \
     python3-dev \
     python3-numpy \
+    python-is-python3 \
     npm \
     openssh-server \
     && apt-get clean -y \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 RUN useradd -m -s /bin/bash -N -u $UID -g $GID $USER \
@@ -99,23 +100,23 @@ RUN apt-get update \
     libdbus-glib-1-2 \
     && apt-get purge -y pm-utils *screensaver* \
     && apt-get clean -y \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
 
 ### Install chromium
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
     chromium \
     && ln -sfn /usr/bin/chromium /usr/bin/chromium-browser \
     && apt-get clean -y \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
 
 ### Install xvnc-server & noVNC - HTML5 based VNC viewer
 RUN apt-get update \
     && apt-get install -y \
     tigervnc-standalone-server \
     tigervnc-common \
     && apt-get clean -y \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
 
 RUN printf '\n# mcpo-simple-server-desktop-xfce4:\n$localhost = "no";\n1;\n' >>/etc/tigervnc/vncserver-config-defaults \
     && mkdir -p $NO_VNC_HOME/utils/websockify \
@@ -130,29 +131,32 @@ RUN for f in /usr/lib/python3*/EXTERNALLY-MANAGED; do \
 
 ### Install nvm
 RUN wget -qO- https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash && \
-    /bin/bash -c "source $HOME/.nvm/nvm.sh && nvm install $NODE_VERSION && nvm use --delete-prefix $NODE_VERSION"
+    /bin/bash -c "source $HOME/.nvm/nvm.sh && nvm install stable && nvm use stable" \
+    && chown -R $USER:$GID $HOME/.nvm
 
 ### Install python uvx
 RUN PIP_BREAK_SYSTEM_PACKAGES=1 python3 -m pip install uvx && \
     pip3 install setuptools
 
 # Switch to user
 USER appuser
-ENV PATH="/home/appuser/.local/bin:${PATH}" \
-    APP_VERSION=${APP_VERSION}
 ADD --chown=$USER:$GID ./docker/src/home/ $HOME/
 ADD ./docker/src/startup/ $STARTUPDIR
-RUN mkdir -p /app/mcpo_simple_server \
+RUN mkdir -p ${APP_FOLDER} \
     && chmod +x $HOME/wm_startup.sh \
     && touch $HOME/.bashrc 
 
 WORKDIR /home/appuser
 
 ### Install MCPoSimpleServer
-ADD --chown=$USER:$GID ./src/mcpo_simple_server /app/mcpo_simple_server/
-RUN rm -rf /app/mcpo_simple_server/data/config \
-    && rm -rf /app/mcpo_simple_server/.env \
-    && sudo pip3 install -r /app/mcpo_simple_server/requirements.txt
+ADD --chown=$USER:$GID ./src/mcpo_simple_server ${APP_FOLDER}/
+ARG APP_VERSION
+RUN rm -rf ${APP_FOLDER}/data/config \
+    && rm -rf ${APP_FOLDER}/.env \
+    && sudo pip3 install -r ${APP_FOLDER}/requirements.txt \
+    && if [ ! -z "${APP_VERSION}" ]; then \
+    echo "__version__ = \"${APP_VERSION}\"" > ${APP_FOLDER}/_version.py; \
+    fi
 
 # Use supervisord to manage both VNC and Uvicorn
 COPY ./docker/src/supervisor/conf.d/* /etc/supervisor/conf.d/

docker/docker-compose.yaml

@@ -7,6 +7,8 @@ services:
     #build:
     #  context: ..
     #  dockerfile: ./docker/Dockerfile
+    #  args:
+    #    - APP_VERSION=${APP_VERSION:-0.0.0}
     ports:
       - 2222:22       # SSH port
       - 8000:8000     # API HTTP MCPoSimpleServer port
@@ -28,12 +30,12 @@ services:
 
 networks:
   default:
-    name: simpletool
+    name: mcpo-simple-server
 
 # Create volume for data
 volumes:
   data:
-    name: simpletool-server-data
+    name: mcpo-simple-server-data
     driver_opts:
       type: none
       o: bind

src/mcpo_simple_server/__main__.py

@@ -6,8 +6,7 @@
 import sys
 import argparse
 import uvicorn
-from loguru import logger
-from mcpo_simple_server.main import fastapi
+from mcpo_simple_server.logger import logger
 
 
 def parse_args():

src/mcpo_simple_server/_version.py

@@ -1,3 +1 @@
-"""Version information."""
-
-__version__ = "0.1.0"
+__version__ = "0.13.0"

src/mcpo_simple_server/config.py

@@ -5,21 +5,30 @@
 """
 import os
 import pathlib
-
-# Import version from central location
+from mcpo_simple_server.logger import logger
 from mcpo_simple_server._version import __version__
 
 # Define application paths
 APP_PATH = pathlib.Path(os.getcwd())
-APP_VERSION = os.getenv("APP_VERSION", __version__)
+APP_VERSION = str(__version__)
 APP_NAME = "MCPoSimpleServer"
 CONFIG_STORAGE_TYPE = os.getenv("CONFIG_STORAGE_TYPE", "files")
 CONFIG_STORAGE_PATH = os.getenv("CONFIG_STORAGE_PATH", str(APP_PATH / "data" / "config"))
 
+
 # If the path points to a file (config.json), extract the directory path
 if CONFIG_STORAGE_PATH.endswith(".json"):
     CONFIG_MAIN_FILE_PATH = CONFIG_STORAGE_PATH
     CONFIG_STORAGE_PATH = os.path.dirname(CONFIG_STORAGE_PATH)
 else:
     # If it's already a directory, append config.json for the file path
     CONFIG_MAIN_FILE_PATH = os.path.join(CONFIG_STORAGE_PATH, "config.json")
+
+
+# Create the config directory if it doesn't exist
+try:
+    if not os.path.exists(CONFIG_STORAGE_PATH):
+        os.makedirs(CONFIG_STORAGE_PATH)
+        logger.info(f"📁 Config directory created: {CONFIG_STORAGE_PATH}")
+except Exception as e:
+    logger.error(f"Failed to create config directory at {CONFIG_STORAGE_PATH}: {str(e)}")

src/mcpo_simple_server/main.py

@@ -5,8 +5,8 @@
 from typing import Any
 from mcpo_simple_server.logger import logger
 from mcpo_simple_server.config import CONFIG_MAIN_FILE_PATH, APP_VERSION, APP_NAME
-import mcpo_simple_server.routers.prompts as prompts_module
 import mcpo_simple_server.routers.admin as admin_module
+import mcpo_simple_server.routers.public as public_module
 import mcpo_simple_server.routers.mcp_sse as mcp_sse_module
 import mcpo_simple_server.routers.tools as tools_module
 import mcpo_simple_server.routers.user as user_module
@@ -42,9 +42,9 @@
 
 # Include routers
 fastapi.include_router(user_module.router)
-fastapi.include_router(mcp_sse_module.router)  # Include the SSE transport router
-fastapi.include_router(prompts_module.router)
+fastapi.include_router(public_module.router)
 fastapi.include_router(admin_module.router)
+fastapi.include_router(mcp_sse_module.router)  # Include the SSE transport router
 
 
 def custom_openapi():

src/mcpo_simple_server/routers/__init__.py

@@ -5,10 +5,10 @@
 """
 
 # Define what should be exported from this package
-__all__ = ['admin_router', 'tools_router', 'user_router', 'mcp_sse_router']
+__all__ = ['admin_router', 'tools_router', 'public_router', 'mcp_sse_router']
 
 # Import the router modules directly
 from .admin import router as admin_router
 from .tools import router as tools_router
-from .user import router as user_router
+from .public import router as public_router
 from .mcp_sse import router as mcp_sse_router