simwrapper 4.0.0b1__tar.gz → 4.0.1__tar.gz

simwrapper-4.0.1/CONFIG-EXAMPLE.yaml

@@ -0,0 +1,31 @@
+# config-example.yaml
+# This file defines storage locations and any
+# front-page "readme" material in markdown
+# ------------------------------------------------
+
+# --- STORAGE ----------------------
+# **Local/network mounts only: no http URLs here**
+# Each key defines a starting point in the local filesystem.
+# (if no config is found, the current working folder is shared)
+storage:
+  data:
+    path: '/Users/billy/data'
+    description: 'Local data on my laptop'
+  vsp-public:
+    path: '/Users/billy/public-svn'
+    description: 'VSP/TU-Berlin public datasets'
+
+# --- FRONT-PAGE TEXT -------------
+# Readme can either be a .md markdown filename,
+# or you can put markdown text directly in this file with "readme: |"
+#
+tagline: 'Transport simulation data visualizer'
+# readme: 'readme.md'
+# # or
+# readme: |
+#   Welcome to My SimWrapper
+#   ========================
+#   Markdown text here
+#   - notes 1
+#   - notes 2
+

{simwrapper-4.0.0b1 → simwrapper-4.0.1}/Makefile

@@ -33,7 +33,7 @@ push: build
 > twine upload dist/*
 .PHONY: push
 
-.build-sentinel: $(shell find simwrapper/*.py) VERSION README.md
+.build-sentinel: $(shell find simwrapper/*.py) pyproject.toml README.md
 > rm -rf dist
 > python3 -m build
 > twine check dist/*

{simwrapper-4.0.0b1 → simwrapper-4.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simwrapper
-Version: 4.0.0b1
+Version: 4.0.1
 Summary: Run SimWrapper from Python
 Project-URL: Homepage, https://docs.simwrapper.app
 Project-URL: Repository, https://github.com/simwrapper/simwrapper-python-tools
@@ -8,6 +8,7 @@ License-Expression: GPL-3.0-or-later
 License-File: LICENSE.txt
 Requires-Python: >=3.11
 Requires-Dist: blosc>=1.11.2
+Requires-Dist: build>=1.2.2.post1
 Requires-Dist: click>=8.0
 Requires-Dist: flask-cors>=5.0.1
 Requires-Dist: flask-restful>=0.3.10
@@ -24,46 +25,100 @@ Description-Content-Type: text/markdown
 
 Official python library for working with SimWrapper.
 
-[SimWrapper](https://simwrapper.github.io) is a data visualization tool for exploring large transport simulation results.
+[SimWrapper](https://simwrapper.app) is a data visualization tool for exploring large transport simulation results.
 
-Web browsers all block access to your local filesystem from external websites, for obvious security reasons. The SimWrapper website needs access to model run outputs on your filesystem. This program bridges that gap: it is a command-line tool that starts a local file server in a specific folder, so that you can access the files in that folder using SimWrapper.
+Normally, web browsers block access to your local filesystem from external websites, for obvious security reasons. The SimWrapper website needs access to model run outputs on your filesystem.
+
+This python program bridges that gap: it is a command-line tool that starts a local file server in a specific folder of your choosing, so that you can access the files in that folder using SimWrapper!
 
 ## About this library
 
 This library contains the "simwrapper" command-line tool, which allows browsing of local files on your PC/laptop using the SimWrapper website.
 
-We are at the very early stages of building this tool. The API will change, things will break, and there are certainly bugs.
-
-- Our primary goal is to make it easy to get local simulation results viewable using the SimWrapper website.
-- We have only tested this using Anaconda Python. Only Python 3.x is supported.
+- Only Python 3.10+ is supported.
 
 ## Installation
 
-Installation requires the `pip` package manager.
+This package is on the PyPi pip package library. You can use pip or the more modern **uv** tool to install it. Note it has many scientific library dependencies, so it's best to use a virtual environment (via uv)
 
 - Install using `pip install simwrapper`
 - To upgrade to the latest version, `pip install --upgrade simwrapper`
 
+## Running Simwrapper locally
+
 This package includes an embedded copy of the Javascript code from the SimWrapper
-project, available separately at https://github.com/simwrapper/simwrapper. That code is under the
-identical GNU GPL V3 and is embedded here with explicit permission of the author.
+project, available separately at https://github.com/simwrapper/simwrapper. No monorepo here! Maybe someday.
 
 ## Usage
 
-`simwrapper` knows three commands.
+`simwrapper` knows four commands.
+
+### simwrapper run [config.yaml]
+
+starts a _local instance of the SimWrapper website_ running on your machine and usually listening on port 4999. Run this command if you have a machine on your local network which contains outputs you'd like to view (such as a modeling server), and that machine has not been set up with any other file sharing software such as NGINX or Apache.
+
+- This command is designed to support the use case where an agency has (1) a local network with files stored on a central "modeling server" or file server, and also (2) desktop machines or laptops on the local network that wish to access those files using SimWrapper.
+- Ultimately you may decide that you want to put simwrapper behind a proxy server such as those listed, for improved performance, features, and security.
+
+This is especially useful if you use cloud-based storage such as AWS or Azure. You can **mount your cloud storage** to a local folder using a tool such as [Rclone mount](https://rclone.org/commands/rclone_mount/), and use this `simwrapper run` to browse your files and results!
+
+**Options:**
+
+`simwrapper run [config-file.yaml]` will read configuration from specified file.
+
+- If not provided, simwrapper will serve the files found in the current working folder. If provided, the YAML file can provide three sections:
+
+  - **storage** - a list of mount points (folders) that simwrapper should share
+  - **tagline** - the front page tagline, default "Transport simulation data visualizer"
+  - **readme** - Markdown filename or raw markdown text to be shown on front page
+
+**Example: config.yaml:**
+
+```yaml
+# --- STORAGE ----------------------
+# **Local/network mounts only: no http URLs here**
+# Each key defines a starting point in the local filesystem.
+# (if no config is found, the current working folder is shared)
+storage:
+  data:
+    path: '/Users/billy/data'
+    description: 'Local data on my laptop'
+  vsp-public:
+    path: '/Users/billy/public-svn'
+    description: 'VSP/TU-Berlin public datasets'
+
+# --- FRONT-PAGE TEXT -------------
+# Readme can either be a .md markdown filename,
+# or you can put markdown text directly in this file with "readme: |"
+#
+tagline: 'Transport simulation data visualizer'
+readme: 'readme.md'
+# # or...
+# readme: |
+# Welcome to My SimWrapper
+# ========================
+# Markdown text here
+# - notes 1
+# - notes 2
+```
 
-**simwrapper serve**
+---
+### simwrapper serve
 
 starts a local file server in the current directory. Run this command, then browse to either <https://vsp.berlin/simwrapper> or <https://activitysim.github.io/dashboard> to view your local folder outputs.
 
-**simwrapper here**
+---
+### simwrapper here
+
+_Deprecated - "use simwrapper run" instead_
 
 starts a _local copy of the SimWrapper website_ usually listening on port 8050. Run this command instead of `simwrapper serve` if you have a machine on your local network which contains outputs you'd like to view (such as a modeling server), and that machine has not been set up with any other file sharing software such as NGINX or Apache.
 
 - This command is designed to support the use case where an agency has (1) a local network with files stored on a central "modeling server" or file server, and also (2) desktop machines or laptops on the local network that wish to access those files using SimWrapper.
 - Note, it's not a battle-tested multi-threaded web proxy server such as Apache, NGINX, or Gunicorn. Ultimately you may decide that you want to put simwrapper behind a proxy server such as those listed, for improved performance, features, and security.
 
-**simwrapper open [vsp|asim]**
+---
+### simwrapper open [vsp|asim]
 
 opens a new web browser tab AND a local file server in the current directory. The site will only operate as long as you keep that local server running, so don't close the command window.
 
@@ -73,6 +128,8 @@ opens a new web browser tab AND a local file server in the current directory. Th
 
 All three simwrapper commands start a small local file server, listening on a local port number. The site will only operate as long as you keep that local server running: quitting the command with CTRL-C or closing the command window will shut down the server.
 
+---
+
 ## Security
 
 When `simwrapper` is running, it listens for connections on your network interface. Your computer's **firewall rules and router settings** determine whether other machines on the network can access the folder, or not.
@@ -83,6 +140,8 @@ By default, almost all computers now run firewalls which block external access.
 
 ## Running as HTTPS - required for Safari
 
+_We really just don't recommend using Safari. It is by far the slowest of all the browsers, and doesn't allow many advanced features because Apple wants to hold the open web back and push people to Apps_
+
 Safari blocks HTTPS websites (such as SimWrapper VSP and ASIM) which access localhost resources such as this local simwrapper file server. _We recommend Chromium-based browsers_ such as Google Chrome, Brave, and Microsoft Edge, because they are much faster than Safari. But you can run simwrapper in HTTPS mode by following these extra instructions.
 
 Simwrapper commands accept `--key` and `--cert` options to specify the two pieces of a PEM certicate. You can create a PEM certificate for "localhost" and install it in your browser's certificate database with the following commands.
@@ -93,7 +152,7 @@ This requires Homebrew, which supplies the `brew` command.
 brew install mkcert nss   # installs mkcert command
 mkcert localhost          # Create PEM key/cert files for "localhost"
 mkcert -install           # Installs certificates in browser
-```
+````
 
 This creates two files: `localhost.pem` and `localhost-key.pem`. Move them somewhere where you cn find them.
 
@@ -116,6 +175,7 @@ The python `simwrapper` tool contains a fully-built static copy of the SimWrappe
 Here are the basic steps to do that:
 
 - In the SimWrapper javascript project repo:
+
   - Make any changes to the [SimWrapper javascript code](https://github.com/simwrapper/simwrapper) as needed, and test vigorously
   - Ensure that both `vite.config.js` and `public/404.html` are both set to have prefix "/" instead of "/simwrapper/" or "/dashboard/". The Python tool will not work if there is a URL prefix in the path.
   - Run `npm run build` to compile everything into the `dist` folder.
@@ -138,16 +198,16 @@ If everything is running smoothly, then push the project to pip and conda:
 - Commit the version bump, and push changes to Github
 - Push to PyPi (pip) with `make push`
 - Take note of the SHA256 string for the new `version.tar.gz` at https://pypi.org/project/simwrapper
-  which can be found on the "Download Files" page 
+  which can be found on the "Download Files" page
 
 ### Updating conda
 
+_Conda is also deprecated. Stop using Anaconda._
+
 - Modify the conda "feedstock" fork at https://github.com/simwrapper/simwrapper-feedstock :
   - Edit `recipe/meta.yaml`: you probably just need to change the version string and the SHA256
   - The SHA256 is found on https://pypi.org/project/simwrapper on the Download Files page
 - Push to Github
 - Create a pull request on https://github.com/conda-forge/simwrapper-feedstock
-  - Make notes in the PR description, checking off the relevant boxes. 
+  - Make notes in the PR description, checking off the relevant boxes.
   - You don't need to do a "rerender" unless you've changed Python versions (I think)
-
-

{simwrapper-4.0.0b1 → simwrapper-4.0.1}/README.md

@@ -2,46 +2,100 @@
 
 Official python library for working with SimWrapper.
 
-[SimWrapper](https://simwrapper.github.io) is a data visualization tool for exploring large transport simulation results.
+[SimWrapper](https://simwrapper.app) is a data visualization tool for exploring large transport simulation results.
 
-Web browsers all block access to your local filesystem from external websites, for obvious security reasons. The SimWrapper website needs access to model run outputs on your filesystem. This program bridges that gap: it is a command-line tool that starts a local file server in a specific folder, so that you can access the files in that folder using SimWrapper.
+Normally, web browsers block access to your local filesystem from external websites, for obvious security reasons. The SimWrapper website needs access to model run outputs on your filesystem.
+
+This python program bridges that gap: it is a command-line tool that starts a local file server in a specific folder of your choosing, so that you can access the files in that folder using SimWrapper!
 
 ## About this library
 
 This library contains the "simwrapper" command-line tool, which allows browsing of local files on your PC/laptop using the SimWrapper website.
 
-We are at the very early stages of building this tool. The API will change, things will break, and there are certainly bugs.
-
-- Our primary goal is to make it easy to get local simulation results viewable using the SimWrapper website.
-- We have only tested this using Anaconda Python. Only Python 3.x is supported.
+- Only Python 3.10+ is supported.
 
 ## Installation
 
-Installation requires the `pip` package manager.
+This package is on the PyPi pip package library. You can use pip or the more modern **uv** tool to install it. Note it has many scientific library dependencies, so it's best to use a virtual environment (via uv)
 
 - Install using `pip install simwrapper`
 - To upgrade to the latest version, `pip install --upgrade simwrapper`
 
+## Running Simwrapper locally
+
 This package includes an embedded copy of the Javascript code from the SimWrapper
-project, available separately at https://github.com/simwrapper/simwrapper. That code is under the
-identical GNU GPL V3 and is embedded here with explicit permission of the author.
+project, available separately at https://github.com/simwrapper/simwrapper. No monorepo here! Maybe someday.
 
 ## Usage
 
-`simwrapper` knows three commands.
+`simwrapper` knows four commands.
+
+### simwrapper run [config.yaml]
+
+starts a _local instance of the SimWrapper website_ running on your machine and usually listening on port 4999. Run this command if you have a machine on your local network which contains outputs you'd like to view (such as a modeling server), and that machine has not been set up with any other file sharing software such as NGINX or Apache.
+
+- This command is designed to support the use case where an agency has (1) a local network with files stored on a central "modeling server" or file server, and also (2) desktop machines or laptops on the local network that wish to access those files using SimWrapper.
+- Ultimately you may decide that you want to put simwrapper behind a proxy server such as those listed, for improved performance, features, and security.
+
+This is especially useful if you use cloud-based storage such as AWS or Azure. You can **mount your cloud storage** to a local folder using a tool such as [Rclone mount](https://rclone.org/commands/rclone_mount/), and use this `simwrapper run` to browse your files and results!
+
+**Options:**
+
+`simwrapper run [config-file.yaml]` will read configuration from specified file.
+
+- If not provided, simwrapper will serve the files found in the current working folder. If provided, the YAML file can provide three sections:
+
+  - **storage** - a list of mount points (folders) that simwrapper should share
+  - **tagline** - the front page tagline, default "Transport simulation data visualizer"
+  - **readme** - Markdown filename or raw markdown text to be shown on front page
+
+**Example: config.yaml:**
+
+```yaml
+# --- STORAGE ----------------------
+# **Local/network mounts only: no http URLs here**
+# Each key defines a starting point in the local filesystem.
+# (if no config is found, the current working folder is shared)
+storage:
+  data:
+    path: '/Users/billy/data'
+    description: 'Local data on my laptop'
+  vsp-public:
+    path: '/Users/billy/public-svn'
+    description: 'VSP/TU-Berlin public datasets'
+
+# --- FRONT-PAGE TEXT -------------
+# Readme can either be a .md markdown filename,
+# or you can put markdown text directly in this file with "readme: |"
+#
+tagline: 'Transport simulation data visualizer'
+readme: 'readme.md'
+# # or...
+# readme: |
+# Welcome to My SimWrapper
+# ========================
+# Markdown text here
+# - notes 1
+# - notes 2
+```
 
-**simwrapper serve**
+---
+### simwrapper serve
 
 starts a local file server in the current directory. Run this command, then browse to either <https://vsp.berlin/simwrapper> or <https://activitysim.github.io/dashboard> to view your local folder outputs.
 
-**simwrapper here**
+---
+### simwrapper here
+
+_Deprecated - "use simwrapper run" instead_
 
 starts a _local copy of the SimWrapper website_ usually listening on port 8050. Run this command instead of `simwrapper serve` if you have a machine on your local network which contains outputs you'd like to view (such as a modeling server), and that machine has not been set up with any other file sharing software such as NGINX or Apache.
 
 - This command is designed to support the use case where an agency has (1) a local network with files stored on a central "modeling server" or file server, and also (2) desktop machines or laptops on the local network that wish to access those files using SimWrapper.
 - Note, it's not a battle-tested multi-threaded web proxy server such as Apache, NGINX, or Gunicorn. Ultimately you may decide that you want to put simwrapper behind a proxy server such as those listed, for improved performance, features, and security.
 
-**simwrapper open [vsp|asim]**
+---
+### simwrapper open [vsp|asim]
 
 opens a new web browser tab AND a local file server in the current directory. The site will only operate as long as you keep that local server running, so don't close the command window.
 
@@ -51,6 +105,8 @@ opens a new web browser tab AND a local file server in the current directory. Th
 
 All three simwrapper commands start a small local file server, listening on a local port number. The site will only operate as long as you keep that local server running: quitting the command with CTRL-C or closing the command window will shut down the server.
 
+---
+
 ## Security
 
 When `simwrapper` is running, it listens for connections on your network interface. Your computer's **firewall rules and router settings** determine whether other machines on the network can access the folder, or not.
@@ -61,6 +117,8 @@ By default, almost all computers now run firewalls which block external access.
 
 ## Running as HTTPS - required for Safari
 
+_We really just don't recommend using Safari. It is by far the slowest of all the browsers, and doesn't allow many advanced features because Apple wants to hold the open web back and push people to Apps_
+
 Safari blocks HTTPS websites (such as SimWrapper VSP and ASIM) which access localhost resources such as this local simwrapper file server. _We recommend Chromium-based browsers_ such as Google Chrome, Brave, and Microsoft Edge, because they are much faster than Safari. But you can run simwrapper in HTTPS mode by following these extra instructions.
 
 Simwrapper commands accept `--key` and `--cert` options to specify the two pieces of a PEM certicate. You can create a PEM certificate for "localhost" and install it in your browser's certificate database with the following commands.
@@ -71,7 +129,7 @@ This requires Homebrew, which supplies the `brew` command.
 brew install mkcert nss   # installs mkcert command
 mkcert localhost          # Create PEM key/cert files for "localhost"
 mkcert -install           # Installs certificates in browser
-```
+````
 
 This creates two files: `localhost.pem` and `localhost-key.pem`. Move them somewhere where you cn find them.
 
@@ -94,6 +152,7 @@ The python `simwrapper` tool contains a fully-built static copy of the SimWrappe
 Here are the basic steps to do that:
 
 - In the SimWrapper javascript project repo:
+
   - Make any changes to the [SimWrapper javascript code](https://github.com/simwrapper/simwrapper) as needed, and test vigorously
   - Ensure that both `vite.config.js` and `public/404.html` are both set to have prefix "/" instead of "/simwrapper/" or "/dashboard/". The Python tool will not work if there is a URL prefix in the path.
   - Run `npm run build` to compile everything into the `dist` folder.
@@ -116,16 +175,16 @@ If everything is running smoothly, then push the project to pip and conda:
 - Commit the version bump, and push changes to Github
 - Push to PyPi (pip) with `make push`
 - Take note of the SHA256 string for the new `version.tar.gz` at https://pypi.org/project/simwrapper
-  which can be found on the "Download Files" page 
+  which can be found on the "Download Files" page
 
 ### Updating conda
 
+_Conda is also deprecated. Stop using Anaconda._
+
 - Modify the conda "feedstock" fork at https://github.com/simwrapper/simwrapper-feedstock :
   - Edit `recipe/meta.yaml`: you probably just need to change the version string and the SHA256
   - The SHA256 is found on https://pypi.org/project/simwrapper on the Download Files page
 - Push to Github
 - Create a pull request on https://github.com/conda-forge/simwrapper-feedstock
-  - Make notes in the PR description, checking off the relevant boxes. 
+  - Make notes in the PR description, checking off the relevant boxes.
   - You don't need to do a "rerender" unless you've changed Python versions (I think)
-
-

{simwrapper-4.0.0b1 → simwrapper-4.0.1}/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-version = "4.0.0b1"
+version = "4.0.1"
 name = "simwrapper"
 description = "Run SimWrapper from Python"
 readme = "README.md"
@@ -7,6 +7,7 @@ license = "GPL-3.0-or-later"
 requires-python = ">=3.11"
 dependencies = [
     "blosc>=1.11.2",
+    "build>=1.2.2.post1",
     "click>=8.0",
     "flask>=3.1.0",
     "flask-cors>=5.0.1",

{simwrapper-4.0.0b1 → simwrapper-4.0.1}/simwrapper/FlaskApp.py

@@ -19,7 +19,6 @@ from functools import wraps
 import openmatrix as omx
 import yaml
 
-from gunicorn.app.base import BaseApplication
 from waitress import serve
 
 import logging
@@ -28,27 +27,13 @@ logger = logging.getLogger('simwrapper')
 
 # STORAGE LOCATIONS -------------------------------------------------
 # Default is to just share the content of the starting folder.
-
 STORAGE = {
-    "flask": "./",
+    "Server": "./",
 }
 STORAGE_ROOTS = {
-    "flask": { "path": "./", "description": "local folder"}
+    "Server": { "path": "./", "description": os.getcwd()}
 }
-
-class GunicornServer(BaseApplication):
-    def __init__(self, app, **kwargs):
-        self.application = app
-        self.options = kwargs
-        super().__init__()
-
-    def load_config(self):
-        for key, value in self.options.items():
-            if key in self.cfg.settings and value is not None:
-                self.cfg.set(key, value)
-
-    def load(self):
-        return self.application
+CONFIG = {"storage": STORAGE_ROOTS}
 
 # ------------------------------------------------
 def nocache(view):
@@ -126,7 +111,7 @@ class File(Resource):
 class Storage(Resource):
     @nocache
     def get(self):
-        return STORAGE_ROOTS
+        return CONFIG
 
 # ------------------------------------------------
 class Omx(Resource):
@@ -213,47 +198,76 @@ def serve_static_files(path):
 
 
 def setupStorageRoots(config, port):
-    global STORAGE, STORAGE_ROOTS
+    """
+    If a config file was passed in, read the config from file and set things up
+    accordingly.
+    Config may have these keys: storage, readme, tagline
+    """
+    global CONFIG, STORAGE, STORAGE_ROOTS
 
     if config:
         with open(config, 'r') as f:
-            STORAGE_ROOTS = yaml.safe_load(f.read())
+
+            YAML = yaml.safe_load(f.read())
+
+            # front page text
+            tagline = "tagline" in YAML and YAML["tagline"] or ""
+            readme = "readme" in YAML and YAML["readme"] or ""
+            if readme and not '\n' in readme:
+                with open(readme, 'r') as r:
+                    readme = r.read()
+
+            # storage locations
             STORAGE = {}
+            if "storage" in YAML:
+                STORAGE_ROOTS = YAML["storage"]
 
             for root in STORAGE_ROOTS:
                 STORAGE[root] = '' + STORAGE_ROOTS[root]["path"]
-
             # putting this here, but the website will replace the path given
             # with the window href location. That way, whatever URL/ipaddr the
             # user entered to reach the flask server will be used.
             for root in STORAGE_ROOTS:
                 STORAGE_ROOTS[root]["path"] = f"http://localhost:{port}"
 
+            CONFIG = {
+                "storage": STORAGE_ROOTS,
+                "tagline": tagline,
+                "readme": readme
+            }
+
+            print('HELLO', CONFIG)
+
+def startGunicorn(port, debug):
+    from .GunicornServer import GunicornServer
+
+    gunicorn_options = {
+        'bind': f'0.0.0.0:{port}',
+        'workers': 4,
+        'threads': 2,
+        'reload': debug,
+        'loglevel': debug and 'debug' or 'info',
+        'access_log': '-',  # Log to stdout
+        'error_log': '-',   # Log to stderr
+    }
+    GunicornServer(app, **gunicorn_options).run()
+
 # ----------------------------------------
 def startFlask(config=None, port=4999, debug=False):
     print('\n--- SET UP: storage roots')
     setupStorageRoots(config,port)
-    print(STORAGE)
 
     print('\n--- START-FLASK', config, port)
+    print(f'--- If link below does not work, try server name or localhost: http://localhost:{port}\n\n')
 
     if os.name == 'nt':
         # Windows: use waitress
         logger.setLevel(debug and logging.DEBUG or logging.INFO)
-        serve(app, host='0.0.0.0', port=port, threads=16)
+        serve(app, listen=f"*:{port}", threads=16)
 
     else:
         # Use Gunicorn
-        gunicorn_options = {
-            'bind': f'0.0.0.0:{port}',
-            'workers': 4,
-            'threads': 2,
-            'reload': debug,
-            'loglevel': debug and 'debug' or 'info',
-            'access_log': '-',  # Log to stdout
-            'error_log': '-',   # Log to stderr
-        }
-        GunicornServer(app, **gunicorn_options).run()
+        startGunicorn(port,debug)
 
 # ----------------------------------------
 if __name__ == "__main__":

simwrapper-4.0.1/simwrapper/GunicornServer.py

@@ -0,0 +1,15 @@
+from gunicorn.app.base import BaseApplication
+
+class GunicornServer(BaseApplication):
+    def __init__(self, app, **kwargs):
+        self.application = app
+        self.options = kwargs
+        super().__init__()
+
+    def load_config(self):
+        for key, value in self.options.items():
+            if key in self.cfg.settings and value is not None:
+                self.cfg.set(key, value)
+
+    def load(self):
+        return self.application

{simwrapper-4.0.0b1 → simwrapper-4.0.1}/simwrapper/cli.py

@@ -74,7 +74,7 @@ def here():
 @click.option('--debug', is_flag=True, default=False, help="Debug mode")
 # @click.option('--cert', default=None, help="PEM Certificate filename. Provide both a certificate and key to serve HTTPS")
 # @click.option('--key', default=None, help="PEM Key filename. Provide both a certificate and key to serve HTTPS")
-def flask(config, port, debug):
+def run(config, port, debug):
     """Run the SimWrapper 'flask' app for local or networked files
 
     CONFIG is the path to the config.py file containing the root paths to be served. Defaults to the current folder if not provided.

simwrapper-4.0.1/simwrapper/static/CNAME

@@ -0,0 +1 @@
+simwrapper.app