simwrapper 4.2.0__tar.gz → 4.2.1__tar.gz

{simwrapper-4.2.0 → simwrapper-4.2.1}/CONFIG-EXAMPLE.yaml

@@ -12,8 +12,10 @@ storage:
     path: '/Users/billy/data'
     description: 'Local data from this server'
 
+
 # --- FRONT-PAGE TEXT -------------
 tagline: 'Transport simulation data visualizer'
+
 # Optional readme can be either a .md markdown filename,
 # or you can put markdown text directly in this file with "readme: |"
 # readme: |

{simwrapper-4.2.0 → simwrapper-4.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simwrapper
-Version: 4.2.0
+Version: 4.2.1
 Summary: SimWrapper command line tools
 Project-URL: Homepage, https://docs.simwrapper.app
 Project-URL: Repository, https://github.com/simwrapper/simwrapper-python-tools

{simwrapper-4.2.0 → simwrapper-4.2.1}/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-version = "4.2.0"
+version = "4.2.1"
 name = "simwrapper"
 description = "SimWrapper command line tools"
 readme = "README.md"

{simwrapper-4.2.0 → simwrapper-4.2.1}/simwrapper/FlaskApp.py

@@ -8,7 +8,7 @@
 # (2) Provides a REST API application that accepts file requests for
 #     OMX files that are stored on cloud services such as AWS/Azure
 
-import os,sys
+import os,sys, pprint
 import blosc
 from os.path import exists
 import yaml
@@ -41,6 +41,8 @@ STORAGE_ROOTS = {
 }
 CONFIG = {"storage": STORAGE_ROOTS}
 
+ZONES = {}
+
 # ------------------------------------------------
 def nocache(view):
     @wraps(view)
@@ -98,7 +100,7 @@ class File(Resource):
         if sys.platform.startswith("win"): path = path.replace("/", "\\")
         try:
             if not os.path.isfile(path):
-                return f"File not found: {str(e)}", 400
+                return f"File not found: {path}", 400
             # all otherwise
             with open(path, 'rb') as file:
                 content = file.read()
@@ -193,7 +195,7 @@ def serve_static_files(path):
     if path.startswith('omx/'): return "Not Found", 404
 
     # List of file extensions that should be served as static files
-    static_extensions = ['.css', '.csv', '.dbf', '.png', '.jpg', '.jpeg', '.js', '.json', '.gif', '.gz', '.md', '.svg', '.ico', '.wasm', '.woff', '.woff2', '.ttf', '.eot', '.yaml', '.zip']
+    static_extensions = ['.css', '.csv', '.dbf', '.png', '.geojson', '.jpg', '.jpeg', '.js', '.json', '.gif', '.gz', '.md', '.svg', '.ico', '.wasm', '.woff', '.woff2', '.ttf', '.eot', '.yaml', '.zip']
 
     # Check if the requested file has a static file extension
     if any(path.endswith(ext) for ext in static_extensions):
@@ -213,13 +215,13 @@ def serve_static_files(path):
     return send_from_directory('static', 'index.html')
 
 
-def setupStorageRoots(config, port):
+def setupConfiguration(config, port):
     """
     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
+    Config may have these keys: storage, readme, tagline, zones
     """
-    global CONFIG, STORAGE, STORAGE_ROOTS
+    global CONFIG, STORAGE, STORAGE_ROOTS, ZONES
 
     if config:
         with open(config, 'r') as f:
@@ -246,13 +248,19 @@ def setupStorageRoots(config, port):
             for root in STORAGE_ROOTS:
                 STORAGE_ROOTS[root]["path"] = f"http://localhost:{port}"
 
+            # ZONAL systems
+            if "zones" in YAML:
+                ZONES = YAML["zones"]
+
             CONFIG = {
                 "storage": STORAGE_ROOTS,
                 "tagline": tagline,
-                "readme": readme
+                "readme": readme,
+                "zones": ZONES
             }
 
-            print('HELLO', CONFIG)
+            print('--- STARTING WITH CONFIG:')
+            pprint.pprint(CONFIG, sort_dicts=False, indent=2)
 
 def startGunicorn(port, debug):
     from .GunicornServer import GunicornServer
@@ -271,7 +279,7 @@ def startGunicorn(port, debug):
 # ----------------------------------------
 def startFlask(config=None, port=4999, debug=False):
     print('\n--- SET UP: storage roots')
-    setupStorageRoots(config,port)
+    setupConfiguration(config,port)
 
     print('\n--- START-FLASK', config, port)
     print(f'--- If link below does not work, try server name or localhost: http://localhost:{port}\n\n')

{simwrapper-4.2.0 → simwrapper-4.2.1}/uv.lock

@@ -1331,7 +1331,7 @@ wheels = [
 
 [[package]]
 name = "simwrapper"
-version = "4.2.0"
+version = "4.2.1"
 source = { editable = "." }
 dependencies = [
     { name = "blosc" },