Merge pull request #135 from guzman-raphael/add-raw-component

Expose generic component

Author: A-Baji

.github/workflows/development.yaml

@@ -38,7 +38,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Compile docs static artifacts
         run: |
-          export PHARUS_VERSION=$(cat pharus/version.py | tail -1 | awk -F\" '{print $2}')
+          export PHARUS_VERSION=$(cat pharus/version.py | grep -oP '\d+\.\d+\.\d+')
           export HOST_UID=$(id -u)
           docker-compose -f docker-compose-docs.yaml up --exit-code-from pharus-docs --build
           echo "PHARUS_VERSION=${PHARUS_VERSION}" >> $GITHUB_ENV
@@ -67,7 +67,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Compile image
         run: |
-          export PHARUS_VERSION=$(cat pharus/version.py | tail -1 | awk -F\" '{print $2}')
+          export PHARUS_VERSION=$(cat pharus/version.py | grep -oP '\d+\.\d+\.\d+')
           export HOST_UID=$(id -u)
           docker-compose -f docker-compose-build.yaml up --exit-code-from pharus --build
           IMAGE=$(docker images --filter "reference=datajoint/pharus*" \
@@ -110,7 +110,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Determine package version
         run: |
-          PHARUS_VERSION=$(cat pharus/version.py | tail -1 | awk -F\" '{print $2}')
+          PHARUS_VERSION=$(cat pharus/version.py | grep -oP '\d+\.\d+\.\d+')
           echo "PHARUS_VERSION=${PHARUS_VERSION}" >> $GITHUB_ENV
       - name: Fetch image artifact
         uses: actions/download-artifact@v2
@@ -141,7 +141,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Determine package version
         run: |
-          PHARUS_VERSION=$(cat pharus/version.py | tail -1 | awk -F\" '{print $2}')
+          PHARUS_VERSION=$(cat pharus/version.py | grep -oP '\d+\.\d+\.\d+')
           echo "PHARUS_VERSION=${PHARUS_VERSION}" >> $GITHUB_ENV
       - name: Get changelog entry
         id: changelog_reader
@@ -232,7 +232,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Determine package version
         run: |
-          PHARUS_VERSION=$(cat pharus/version.py | tail -1 | awk -F\" '{print $2}')
+          PHARUS_VERSION=$(cat pharus/version.py | grep -oP '\d+\.\d+\.\d+')
           echo "PHARUS_VERSION=${PHARUS_VERSION}" >> $GITHUB_ENV
       - name: Fetch image artifact
         uses: actions/download-artifact@v2
@@ -281,7 +281,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Determine package version
         run: |
-          PHARUS_VERSION=$(cat pharus/version.py | tail -1 | awk -F\" '{print $2}')
+          PHARUS_VERSION=$(cat pharus/version.py | grep -oP '\d+\.\d+\.\d+')
           echo "PHARUS_VERSION=${PHARUS_VERSION}" >> $GITHUB_ENV
       - name: Fetch docs static artifacts
         uses: actions/download-artifact@v2

docker-compose-build.yaml

@@ -1,4 +1,4 @@
-# PY_VER=3.8 IMAGE=djbase DISTRO=alpine PHARUS_VERSION=$(cat pharus/version.py | tail -1 | awk -F\" '{print $2}') HOST_UID=$(id -u) docker-compose -f docker-compose-build.yaml up --exit-code-from pharus --build
+# PY_VER=3.8 IMAGE=djbase DISTRO=alpine PHARUS_VERSION=$(cat pharus/version.py | grep -oP '\d+\.\d+\.\d+') HOST_UID=$(id -u) docker compose -f docker-compose-build.yaml up --exit-code-from pharus --build
 #
 # Intended for updating dependencies and docker image.
 # Used to build release artifacts.

docker-compose-dev.yaml

@@ -1,4 +1,4 @@
-# PY_VER=3.8 IMAGE=djbase DISTRO=alpine PHARUS_VERSION=$(cat pharus/version.py | tail -1 | awk -F\" '{print $2}') HOST_UID=$(id -u) docker-compose -f docker-compose-dev.yaml up
+# PY_VER=3.8 IMAGE=djbase DISTRO=alpine PHARUS_VERSION=$(cat pharus/version.py | grep -oP '\d+\.\d+\.\d+') HOST_UID=$(id -u) docker compose -f docker-compose-dev.yaml up
 #
 # Intended for normal development. Supports hot/live reloading.
 # Note: If requirements or Dockerfile change, will need to add --build flag to docker-compose.

docker-compose-test.yaml

@@ -1,4 +1,4 @@
-# PY_VER=3.8 IMAGE=djtest DISTRO=alpine AS_SCRIPT=FALSE PHARUS_VERSION=$(cat pharus/version.py | tail -1 | awk -F\" '{print $2}') HOST_UID=$(id -u) docker-compose -f docker-compose-test.yaml up --exit-code-from pharus
+# PY_VER=3.8 IMAGE=djtest DISTRO=alpine AS_SCRIPT=FALSE PHARUS_VERSION=$(cat pharus/version.py | grep -oP '\d+\.\d+\.\d+') HOST_UID=$(id -u) docker compose -f docker-compose-test.yaml up --exit-code-from pharus
 #
 # Intended for running test suite locally.
 # Note: If requirements or Dockerfile change, will need to add --build flag.

pharus/component_interface.py

@@ -12,7 +12,6 @@
 import types
 import io
 import numpy as np
-from functools import reduce
 
 
 class NumpyEncoder(json.JSONEncoder):
@@ -45,18 +44,18 @@ def dumps(cls, obj):
         return json.dumps(obj, cls=cls)
 
 
-class FetchComponent:
+class Component:
     def __init__(
         self,
         name,
         component_config,
         static_config,
         connect_creds: dict,
+        payload=None,
     ):
-        lcls = locals()
         self.name = name
-        if static_config:
-            self.static_variables = types.MappingProxyType(static_config)
+        self.type = component_config["type"]
+        self.route = component_config["route"]
         if not all(k in component_config for k in ("x", "y", "height", "width")):
             self.mode = "dynamic"
         else:
@@ -65,8 +64,22 @@ def __init__(
             self.y = component_config["y"]
             self.height = component_config["height"]
             self.width = component_config["width"]
-        self.type = component_config["type"]
-        self.route = component_config["route"]
+        if static_config:
+            self.static_variables = types.MappingProxyType(static_config)
+        self.connection = dj.conn(
+            host=connect_creds["databaseAddress"],
+            user=connect_creds["username"],
+            password=connect_creds["password"],
+            reset=True,
+        )
+        self.payload = payload
+
+
+class FetchComponent(Component):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        component_config = kwargs.get("component_config", args[1] if args else None)
+        lcls = locals()
         exec(component_config["dj_query"], globals(), lcls)
         self.dj_query = lcls["dj_query"]
         if "restriction" in component_config:
@@ -78,12 +91,7 @@ def __init__(
             dj.VirtualModule(
                 s,
                 s,
-                connection=dj.conn(
-                    host=connect_creds["databaseAddress"],
-                    user=connect_creds["username"],
-                    password=connect_creds["password"],
-                    reset=True,
-                ),
+                connection=self.connection,
             )
             for s in inspect.getfullargspec(self.dj_query).args
         ]
@@ -125,37 +133,12 @@ def dj_query_route(self):
         )
 
 
-class InsertComponent:
+class InsertComponent(Component):
     fields_route_format = "{route}/fields"
 
-    def __init__(
-        self,
-        name,
-        component_config,
-        static_config,
-        payload,
-        connect_creds: dict,
-    ):
-        self.name = name
-        self.payload = payload
-        if static_config:
-            self.static_variables = types.MappingProxyType(static_config)
-        if not all(k in component_config for k in ("x", "y", "height", "width")):
-            self.mode = "dynamic"
-        else:
-            self.mode = "fixed"
-            self.x = component_config["x"]
-            self.y = component_config["y"]
-            self.height = component_config["height"]
-            self.width = component_config["width"]
-        self.type = component_config["type"]
-        self.route = component_config["route"]
-        self.connection = dj.conn(
-            host=connect_creds["databaseAddress"],
-            user=connect_creds["username"],
-            password=connect_creds["password"],
-            reset=True,
-        )
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        component_config = kwargs.get("component_config", args[1] if args else None)
         self.fields_map = component_config.get("map")
         self.tables = [
             getattr(
@@ -181,37 +164,22 @@ def __init__(
             ),
             key=lambda p: p.full_table_name,
         )
+        self.destination_lookup = {
+            sub_m.get("input", sub_m["destination"]): sub_m["destination"]
+            for m in (self.fields_map or [])
+            for sub_m in (m.get("map", []) + [m])
+        }
+        self.input_lookup = {v: k for k, v in self.destination_lookup.items()}
 
     def dj_query_route(self):
         with self.connection.transaction:
-            destination_lookup = reduce(
-                lambda m0, m1: dict(
-                    m0,
-                    **(
-                        {
-                            m_t["input"]
-                            if "input" in m_t
-                            else m_t["destination"]: m_t["destination"]
-                            for m_t in m1["map"]
-                        }
-                        if m1["type"] == "table"
-                        else {
-                            m1["input"]
-                            if "input" in m1
-                            else m1["destination"]: m1["destination"]
-                        }
-                    ),
-                ),
-                self.fields_map or [],
-                {},
-            )
             for t in self.tables:
                 t.insert(
                     [
                         {
                             a: v
                             for k, v in r.items()
-                            if (a := destination_lookup.get(k, k))
+                            if (a := self.destination_lookup.get(k, k))
                             in t.heading.attributes
                         }
                         for r in self.payload["submissions"]
@@ -244,27 +212,11 @@ def fields_route(self):
             fields=[
                 dict(
                     (field := source_fields.pop(m["destination"])),
-                    name=m["input" if "input" in m else "destination"],
+                    name=m.get("input", m["destination"]),
                     **(
                         {
-                            "values": field["values"]
-                            if "map" not in m
-                            else [
-                                {
-                                    input_lookup[k]: v
-                                    for k, v in r.items()
-                                    if k
-                                    in (
-                                        input_lookup := {
-                                            table_m["destination"]: table_m[
-                                                "input"
-                                                if "input" in table_m
-                                                else "destination"
-                                            ]
-                                            for table_m in m["map"]
-                                        }
-                                    )
-                                }
+                            "values": [
+                                {self.input_lookup.get(k, k): v for k, v in r.items()}
                                 for r in field["values"]
                             ]
                         }