scope 0.4.0__tar.gz → 0.4.1__tar.gz

{scope-0.4.0 → scope-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scope
-Version: 0.4.0
+Version: 0.4.1
 Summary: Metrics logging and analysis
 Home-page: http://github.com/danijar/scope
 Classifier: Intended Audience :: Science/Research

{scope-0.4.0 → scope-0.4.1}/requirements.txt

@@ -1,5 +1,5 @@
 av
-elements>=3.15.11
+elements>=3.16.6
 fastapi
 numpy
 pillow

{scope-0.4.0 → scope-0.4.1}/scope/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.4.0'
+__version__ = '0.4.1'
 
 from .reader import Reader
 from .writer import Writer

scope-0.4.1/viewer/__main__.py

@@ -0,0 +1,20 @@
+import pathlib
+import sys
+
+import uvicorn
+from . import config
+
+
+config = config.config
+
+print(config)
+
+sys.path.insert(0, str(pathlib.Path(__file__).parent))
+
+uvicorn.run(
+    'server:app',
+    host='0.0.0.0',
+    port=config.port,
+    reload=config.debug,
+    workers=None if config.debug else config.workers,
+)

scope-0.4.1/viewer/config.py

@@ -0,0 +1,15 @@
+import os
+
+import elements
+
+
+config = elements.Flags(
+    port=int(os.environ.get('SCOPE_PORT', 8000)),
+    basedir=os.environ.get('SCOPE_BASEDIR', ''),
+    filesystem=os.environ.get('SCOPE_FILESYSTEM', 'elements'),
+    maxdepth=2,
+    workers=32,
+    debug=False,
+).parse()
+
+assert config.basedir, config.basedir

{scope-0.4.0 → scope-0.4.1}/viewer/server.py

@@ -1,36 +1,24 @@
 import concurrent.futures
 import functools
-import os
 import pathlib
 import struct
 
-import elements
 import fastapi
 import fastapi.responses
 import fastapi.staticfiles
 
 import filesystems
+import config
 
 
-args = elements.Flags(
-    basedir=os.environ.get('SCOPE_ROOT', ''),
-    fs=os.environ.get('SCOPE_FS', 'elements'),
-    maxdepth=2,
-    debug=False,
-).parse()
-print(args)
-assert args.basedir, args.basedir
-basedir = args.basedir.rstrip('/')
-
-
+config = config.config
+app = fastapi.FastAPI(debug=config.debug)
+basedir = config.basedir.rstrip('/')
 fs = dict(
   elements=filesystems.Elements,
   fileutil=filesystems.Fileutil,
   local=filesystems.Local,
-)[args.fs]()
-
-
-app = fastapi.FastAPI(debug=args.debug)
+)[config.filesystem]()
 
 
 @app.get('/api/exps')
@@ -101,7 +89,7 @@ dist = pathlib.Path(__file__).parent / 'dist'
 app.mount('/', fastapi.staticfiles.StaticFiles(directory=dist, html=True))
 
 
-def find_runs(folder, maxdepth=args.maxdepth, workers=64):
+def find_runs(folder, maxdepth=config.maxdepth, workers=64):
   if not workers:
     runs = []
     queue = [(folder, 0)]

scope-0.4.0/viewer/__main__.py

@@ -1,24 +0,0 @@
-import os
-import pathlib
-import sys
-
-import elements
-import uvicorn
-
-
-args, sys.argv[1:] = elements.Flags(
-    port=int(os.environ.get('SCOPE_SERVER_PORT', 8000)),
-    workers=32,
-    debug=False,
-).parse_known()
-
-sys.argv.append(f'--debug={args.debug}')
-sys.path.insert(0, str(pathlib.Path(__file__).parent))
-
-uvicorn.run(
-    'server:app',
-    host='0.0.0.0',
-    port=args.port,
-    reload=args.debug,
-    workers=None if args.debug else args.workers,
-)