Merge pull request #7 from xpublish-experiments/change-assertion-erro…

…r-to-warning

Change assertion error to warning upon failure to register `DatasetProviderPlugin`

.github/workflows/pre-commit.yml

@@ -11,4 +11,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v3
+        with:
+          python-version: '3.11'
       - uses: pre-commit/[email protected]

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
         exclude: test_catalogs
@@ -12,11 +12,11 @@ repos:
       - id: check-added-large-files
 
   - repo: https://github.com/pre-commit/mirrors-autopep8
-    rev: v2.0.2
+    rev: v2.0.4
     hooks:
       - id: autopep8
 
   - repo: https://github.com/asottile/add-trailing-comma
-    rev: v2.4.0
+    rev: v3.1.0
     hooks:
       - id: add-trailing-comma

codecov.yml

@@ -0,0 +1,5 @@
+# turns off codecov PR checks
+coverage:
+  status:
+    project: off
+    patch: off

examples/run_server.py

@@ -40,7 +40,11 @@
 if CATALOG_TYPE == 'intake':
     catalog_path = root_path / 'test_catalogs' / 'test_intake_zarr_catalog.yaml'
 elif CATALOG_TYPE == 'stac':
-    catalog_path = r'https://code.usgs.gov/wma/nhgf/stac/-/raw/main/xpublish_sample_stac/catalog/catalog.json'
+    # catalog_path = r'https://code.usgs.gov/wma/nhgf/stac/-/raw/main/xpublish_sample_stac/catalog/catalog.json'
+    # catalog_path = r'https://code.usgs.gov/wma/nhgf/stac/-/raw/main/catalog2/catalog.json'
+    catalog_path = root_path / 'test_catalogs' / \
+        'sample_stac_catalog' / 'catalog.json'
+
 else:
     raise ValueError(
         f'Invalid catalog type: {CATALOG_TYPE}. Must be "intake" or "stac".',

src/catalog_to_xpublish/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 from catalog_to_xpublish.factory import (
     CatalogImplementation,
     CatalogImplementationFactory,

src/catalog_to_xpublish/server_functions.py

@@ -156,7 +156,13 @@ def create_app(
                 plugin=provider_plugin,
                 plugin_name=cat_prefix,
             )
-            assert cat_prefix in rest_server.plugins
+
+            # if cat_prefix == '', xpublish changes the name to the name of the plugin
+            if (bool(cat_prefix) and cat_prefix not in rest_server.plugins) | (not cat_prefix and provider_plugin.name not in rest_server.plugins):
+                logger.warn(
+                    f'Could not add dataset provider plugin for {cat_prefix} to the server!',
+                )
+                continue
 
             # add all non-dataset provider plugins
             for plugin in app_inputs.xpublish_plugins: