Update carlos pr

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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.4.2] - 2022-08-29
+### Fixed
+- Bugs with UUID and NaN in component_interface.py JSON encoder PR #128
+
+### Added
+- Support for creating virtual modules with `-` in the schema name, use `__` PR #128
+- Support for new `antd-table`, old table filtering will no longer work and the entire table will be deprecated in a later release PR #128
+
 ## [0.4.1] - 2022-03-24
 ### Fixed
 - Bug with otumat version not being tied to the latest PR #119

pharus/component_interface.py

@@ -1,6 +1,5 @@
 """This module is a GUI component library of various common interfaces."""
 import json
-from base64 import b64decode
 import datajoint as dj
 import re
 import inspect
@@ -12,6 +11,7 @@
 import types
 import io
 import numpy as np
+from uuid import UUID
 
 
 class NumpyEncoder(json.JSONEncoder):
@@ -35,6 +35,10 @@ class NumpyEncoder(json.JSONEncoder):
     def default(self, o):
         if type(o) in self.npmap:
             return self.npmap[type(o)](o)
+        if type(o) is UUID:
+            return str(o)
+        if type(o) is str and o == "NaN":
+            return "null"
         if type(o) in (datetime, date):
             return o.isoformat()
         return json.JSONEncoder.default(self, o)
@@ -77,7 +81,7 @@ def __init__(self, name, component_config, static_config, jwt_payload: dict):
         self.vm_list = [
             dj.VirtualModule(
                 s,
-                s,
+                s.replace("__", "-"),
                 connection=dj.conn(
                     host=jwt_payload["databaseAddress"],
                     user=jwt_payload["username"],
@@ -163,30 +167,36 @@ def __init__(self, *args, **kwargs):
     def dj_query_route(self):
         fetch_metadata = self.fetch_metadata
         record_header, table_records, total_count = _DJConnector._fetch_records(
-            query=fetch_metadata["query"] & self.restriction[0],
+            query=fetch_metadata["query"] & self.restriction,
             fetch_args=fetch_metadata["fetch_args"],
-            **{
-                k: (
-                    int(v)
-                    if k in ("limit", "page")
-                    else (
-                        v.split(",")
-                        if k == "order"
-                        else json.loads(b64decode(v.encode("utf-8")).decode("utf-8"))
-                    )
-                )
-                for k, v in request.args.items()
-            },
+            limit=int(request.args["limit"]) if "limit" in request.args else 1000,
+            page=int(request.args["page"]) if "page" in request.args else 1,
+            order=request.args["order"].split(",") if "order" in request.args else None,
         )
-        return dict(
-            recordHeader=record_header, records=table_records, totalCount=total_count
+
+        return NumpyEncoder.dumps(
+            dict(
+                recordHeader=record_header,
+                records=table_records,
+                totalCount=total_count,
+            )
         )
 
     def attributes_route(self):
         attributes_meta = _DJConnector._get_attributes(self.fetch_metadata["query"])
-        return dict(
-            attributeHeaders=attributes_meta["attribute_headers"],
-            attributes=attributes_meta["attributes"],
+        query = self.fetch_metadata["query"] & self.restriction[0]
+        unique_values = []
+        for key in query.heading.attributes.keys():
+            result = (dj.U(key) & query).fetch()
+            unique_values.append(
+                [dict({"text": str(x[0]), "value": x[0]}) for x in result]
+            )
+        return NumpyEncoder.dumps(
+            dict(
+                attributeHeaders=attributes_meta["attribute_headers"],
+                attributes=attributes_meta["attributes"],
+                unique_values=unique_values,
+            )
         )
 
 
@@ -230,8 +240,12 @@ def dj_query_route(self):
             query=fetch_metadata["query"] & self.restriction,
             fetch_args=fetch_metadata["fetch_args"],
         )
-        return dict(
-            recordHeader=record_header, records=table_records, totalCount=total_count
+        return NumpyEncoder.dumps(
+            dict(
+                recordHeader=record_header,
+                records=table_records,
+                totalCount=total_count,
+            )
         )
 
 
@@ -290,9 +304,15 @@ def dj_query_route(self):
         record_header, table_records, total_count = _DJConnector._fetch_records(
             query=fetch_metadata["query"] & self.restriction,
             fetch_args=fetch_metadata["fetch_args"],
+            page=int(request.args["page"]) if "page" in request.args else 1,
+            limit=int(request.args["limit"]) if "limit" in request.args else 1000,
         )
-        return dict(
-            recordHeader=record_header, records=table_records, totalCount=total_count
+        return NumpyEncoder.dumps(
+            dict(
+                recordHeader=record_header,
+                records=table_records,
+                totalCount=total_count,
+            )
         )
 
 
@@ -322,6 +342,7 @@ def dj_query_route(self):
     "basicquery": BasicQuery,
     "plot:plotly:stored_json": PlotPlotlyStoredjsonComponent,
     "table": TableComponent,
+    "antd-table": TableComponent,
     "metadata": MetadataComponent,
     "file:image:attach": FileImageAttachComponent,
     "slider": BasicQuery,

pharus/dynamic_api_gen.py

@@ -107,14 +107,13 @@ def {method_name}() -> dict:
                             method_name_type="dj_query_route",
                         )
                     )
-
                 for comp_name, comp in (
                     grid["component_templates"]
                     if "component_templates" in grid
                     else grid["components"]
                 ).items():
                     if re.match(
-                        r"^(table|metadata|plot|file|slider|dropdown-query).*$",
+                        r"^(table|antd-table|metadata|plot|file|slider|dropdown-query).*$",
                         comp["type"],
                     ):
                         f.write(

pharus/version.py

@@ -1,2 +1,2 @@
 """Package metadata."""
-__version__ = "0.4.1"
+__version__ = "0.4.2"

tests/test_api_gen.py

@@ -85,9 +85,26 @@ def test_get_attributes(token, client, schemas_simple):
                 ["b_number", "float", False, None, False],
             ],
         },
+        "unique_values": [
+            [{"text": "0", "value": 0}, {"text": "1", "value": 1}],
+            [
+                {"text": "10", "value": 10},
+                {"text": "11", "value": 11},
+                {"text": "21", "value": 21},
+            ],
+            [
+                {"text": "Raphael", "value": "Raphael"},
+                {"text": "Bernie", "value": "Bernie"},
+            ],
+            [
+                {"text": "22.12", "value": 22.12},
+                {"text": "-1.21", "value": -1.21},
+                {"text": "7.77", "value": 7.77},
+            ],
+        ],
     }
 
-    assert expected_json == REST_response.get_json()
+    assert expected_json == REST_response.get_json(force=True)
 
 
 def test_dynamic_restriction(token, client, schemas_simple):