Fix usage matching (#18)

* Fix usage matching

Fix linting

* Attempt to fix test case

* Fix Python version used in CI

Test Python 3.13

Author: ml-evs

.github/workflows/ci.yml

@@ -36,16 +36,18 @@ jobs:
         runs-on: ubuntu-latest
         timeout-minutes: 30
         strategy:
-            max-parallel: 3
+            max-parallel: 4
             matrix:
-                python-version: ['3.10', '3.11', '3.12']
+                python-version: ['3.10', '3.11', '3.12', '3.13']
 
         steps:
 
             - uses: actions/checkout@v4
 
             - name: Set up Python ${{ matrix.python-version }}
               uses: actions/setup-python@v5
+              with:
+                python-version: ${{ matrix.python-version }}
 
             - name: Install dependencies
               run: |

beam/__init__.py

@@ -181,13 +181,16 @@ def extract(
                     )
                 extractor = json.loads(entry.read().decode("utf-8"))["data"]
 
-            match = find_matching_usage(
-                usages=extractor["usage"],
-                input_type=input_type,
-                preferred_mode=preferred_mode,
-                preferred_scope=preferred_scope,
-                strict=True,
-            )
+            try:
+                match = find_matching_usage(
+                    usages=extractor["usage"],
+                    input_type=input_type,
+                    preferred_mode=preferred_mode,
+                    preferred_scope=preferred_scope,
+                    strict=True,
+                )
+            except RuntimeError:
+                match = None
             if match is not None:
                 print(f"Found matching usage with extractor: {extractor['id']!r}")
                 matching_definition = extractor
@@ -575,7 +578,12 @@ def parse_usage(
         preferred_mode: SupportedExecutionMethod = SupportedExecutionMethod.PYTHON,
         preferred_scope: SupportedUsageScope = SupportedUsageScope.DATA,
     ) -> tuple[SupportedExecutionMethod, str, str]:
-        usage = find_matching_usage(usages, input_type, preferred_mode, preferred_scope)
+        try:
+            usage = find_matching_usage(
+                usages, input_type, preferred_mode, preferred_scope
+            )
+        except RuntimeError:
+            usage = None
         if not usage:
             raise RuntimeError(
                 f"No matching usage found for {input_type} with {preferred_mode} and {preferred_scope}"

tests/test_mpr.py

@@ -63,7 +63,7 @@ def test_biologic_extract_from_url(tmp_path, test_mpr_urls):
             preferred_mode="python",
             install=(ind == 0),
         )
-        assert data
+        assert data is not None
 
 
 def test_biologic_extract_no_registry(test_mprs):