Merge pull request #112 from jverswijver/update_dynamic_api

Update dynamic api path handling.

Author: guzman-raphael

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
 
+## [0.2.1] - 2021-11-08
+### Fixed
+- Error with retrieving the module's installation root path.
+
 ## [0.2.0] - 2021-11-02
 ### Added
 - Dynamic api generation from spec sheet.(#103, #104, #105, #107, #108, #110) PR #106, #109
@@ -76,6 +80,7 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
 - Support for DataJoint attribute types: `varchar`, `int`, `float`, `datetime`, `date`, `time`, `decimal`, `uuid`.
 - Check dependency utility to determine child table references.
 
+[0.2.1]: https://github.com/datajoint/pharus/compare/0.2.0...0.2.1
 [0.2.0]: https://github.com/datajoint/pharus/compare/0.1.0...0.2.0
 [0.1.0]: https://github.com/datajoint/pharus/compare/0.1.0b2...0.1.0
 [0.1.0b2]: https://github.com/datajoint/pharus/compare/0.1.0b0...0.1.0b2

Dockerfile

@@ -6,6 +6,7 @@ COPY --chown=anaconda:anaconda ./README.rst ./requirements.txt ./setup.py \
     /main/
 COPY --chown=anaconda:anaconda ./pharus/*.py /main/pharus/
 RUN \
+    umask u+rwx,g+rwx,o-rwx && \
     cd /main && \
     pip install . && \
     rm -R /main/*

pharus/dynamic_api_gen.py

@@ -2,6 +2,7 @@
 from pathlib import Path
 import os
 import yaml
+import pkg_resources
 
 
 def populate_api():
@@ -59,8 +60,10 @@ def {method_name}_attributes(jwt_payload: dict) -> dict:
             return str(e), 500
 """
 
+    pharus_root = f"{pkg_resources.get_distribution('pharus').module_path}/pharus"
+    api_path = f'{pharus_root}/dynamic_api.py'
     spec_path = os.environ.get('API_SPEC_PATH')
-    api_path = 'pharus/dynamic_api.py'
+
     with open(Path(api_path), 'w') as f, open(Path(spec_path), 'r') as y:
         f.write(header_template)
         values_yaml = yaml.load(y, Loader=yaml.FullLoader)
@@ -70,7 +73,8 @@ def {method_name}_attributes(jwt_payload: dict) -> dict:
         for page in pages.values():
             for grid in page['grids'].values():
                 for comp in grid['components'].values():
-                    f.write(route_template.format(route=comp['route'],
-                            method_name=comp['route'].replace('/', ''),
-                            query=indent(comp['dj_query'], '    '),
-                            restriction=indent(comp['restriction'], '    ')))
+                    if comp['type'] == 'table':
+                        f.write(route_template.format(route=comp['route'],
+                                method_name=comp['route'].replace('/', ''),
+                                query=indent(comp['dj_query'], '    '),
+                                restriction=indent(comp['restriction'], '    ')))

pharus/version.py

@@ -1,2 +1,2 @@
 """Package metadata."""
-__version__ = '0.2.0'
+__version__ = '0.2.1'

tests/init/test_dynamic_api_spec.yaml

@@ -18,7 +18,7 @@ SciViz: # top level tab
               route: /query1
               row_span: 0
               column_span: 0
-              type: plot:png
+              type: table
               restriction: >
                 def restriction(**kwargs):
                     return dict(**kwargs)
@@ -32,7 +32,7 @@ SciViz: # top level tab
               route: /query2
               row_span: 0
               column_span: 0
-              type: plot:png
+              type: table
               restriction: >
                 def restriction(**kwargs):
                     return dict(**kwargs)
@@ -58,7 +58,7 @@ SciViz: # top level tab
               route: /query3
               row_span: 0
               column_span: 0
-              type: plot:png
+              type: table
               restriction: >
                 def restriction(**kwargs):
                     return dict(**kwargs)
@@ -70,7 +70,7 @@ SciViz: # top level tab
               route: /query4
               row_span: 0
               column_span: 1
-              type: plot:plotly1
+              type: table
               restriction: >
                 def restriction(**kwargs):
                     return dict(**kwargs)
@@ -85,7 +85,7 @@ SciViz: # top level tab
               route: /query5
               row_span: 0
               column_span: 1
-              type: plot:plotly1
+              type: table
               restriction: >
                 def restriction(**kwargs):
                     return dict(a_id=0, **kwargs)