alphapulldown-input-parser 0.3.0__tar.gz → 0.4.0__tar.gz

{alphapulldown_input_parser-0.3.0/src/alphapulldown_input_parser.egg-info → alphapulldown_input_parser-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alphapulldown-input-parser
-Version: 0.3.0
+Version: 0.4.0
 Summary: Fold specification parser for AlphaPulldown
 Author-email: Kosinski Lab <alphapulldown@embl-hamburg.de>
 License: MIT
@@ -30,7 +30,7 @@ Dynamic: license-file
 Reusable parser for AlphaPulldown-style fold specifications. Install it with:
 
 ```bash
-pip install alphapulldown-input-parser
+pip install "alphapulldown-input-parser>=0.4.0"
 ```
 
 or, for local development:
@@ -48,3 +48,17 @@ The package exposes two helpers:
 
 The parser is dependency-free and works across AlphaPulldown, the Snakemake
 pipeline, or any other tooling that consumes the same fold syntax.
+
+As of `0.4.0`, AF3 JSON feature files support the same copy/range suffixes as
+classic AlphaPulldown feature pickles. For example:
+
+```python
+parse_fold(
+    ["P01258_af3_input.json:1-100:2"],
+    features_directory=["/path/to/features"],
+    protein_delimiter="+",
+)
+```
+
+This expands to two folding entries for the same AF3 JSON feature file, each
+restricted to residues `1-100`.

{alphapulldown_input_parser-0.3.0 → alphapulldown_input_parser-0.4.0}/README.md

@@ -3,7 +3,7 @@
 Reusable parser for AlphaPulldown-style fold specifications. Install it with:
 
 ```bash
-pip install alphapulldown-input-parser
+pip install "alphapulldown-input-parser>=0.4.0"
 ```
 
 or, for local development:
@@ -21,3 +21,17 @@ The package exposes two helpers:
 
 The parser is dependency-free and works across AlphaPulldown, the Snakemake
 pipeline, or any other tooling that consumes the same fold syntax.
+
+As of `0.4.0`, AF3 JSON feature files support the same copy/range suffixes as
+classic AlphaPulldown feature pickles. For example:
+
+```python
+parse_fold(
+    ["P01258_af3_input.json:1-100:2"],
+    features_directory=["/path/to/features"],
+    protein_delimiter="+",
+)
+```
+
+This expands to two folding entries for the same AF3 JSON feature file, each
+restricted to residues `1-100`.

{alphapulldown_input_parser-0.3.0 → alphapulldown_input_parser-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "alphapulldown-input-parser"
-version = "0.3.0"
+version = "0.4.0"
 description = "Fold specification parser for AlphaPulldown"
 readme = "README.md"
 license = {text = "MIT"}

{alphapulldown_input_parser-0.3.0 → alphapulldown_input_parser-0.4.0}/src/alphapulldown_input_parser/parser.py

@@ -72,7 +72,8 @@ class RegionSelection:
         return cls(regions=None)
 
 
-# Either {"json_input": "/path/to.json"} or {"CHAIN_A": RegionSelection(...)}
+# Either {"json_input": "/path/to.json", "regions": RegionSelection(...)?}
+# or {"CHAIN_A": RegionSelection(...)}
 FoldEntry = Dict[str, Union[str, RegionSelection]]
 
 
@@ -312,39 +313,21 @@ def expand_fold_specification(
         tokens = [token.strip() for token in pf.split(":")]
         base_token = tokens[0] if tokens else ""
 
-        # JSON inputs: support optional copy number, but no ranges.
+        # JSON inputs: support optional copy number and region ranges.
         if base_token.endswith(".json"):
             path_pf = Path(base_token)
             json_path: Optional[str] = None
             for json_key in (path_pf.name, path_pf.stem):
                 json_path = index.json_path(json_key)
                 if json_path:
-                    # Handle optional copy number for JSON inputs.
-                    if len(tokens) == 1:
-                        copies = 1
-                    else:
-                        extra_tokens = tokens[1:]
-                        # Ranges (e.g. "1-10") are not supported for JSON feature files.
-                        if any("-" in tok for tok in extra_tokens):
-                            _format_error(
-                                spec,
-                                msg="Region ranges are not supported for JSON feature files.",
-                            )
-                        if len(extra_tokens) != 1:
-                            _format_error(
-                                spec,
-                                msg="JSON feature files support only an optional copy number.",
-                            )
-                        try:
-                            copies = int(extra_tokens[0])
-                        except ValueError:
-                            _format_error(
-                                spec,
-                                msg="Copy number for JSON feature file must be an integer.",
-                            )
+                    copies, region_tokens = _extract_copy_and_regions(tokens, spec)
+                    regions = _parse_regions(region_tokens, spec)
 
                     for _ in range(copies):
-                        formatted_folds.append({"json_input": json_path})
+                        json_entry: FoldEntry = {"json_input": json_path}
+                        if not regions.is_all:
+                            json_entry["regions"] = regions
+                        formatted_folds.append(json_entry)
                     break
             if json_path:
                 continue

{alphapulldown_input_parser-0.3.0 → alphapulldown_input_parser-0.4.0/src/alphapulldown_input_parser.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alphapulldown-input-parser
-Version: 0.3.0
+Version: 0.4.0
 Summary: Fold specification parser for AlphaPulldown
 Author-email: Kosinski Lab <alphapulldown@embl-hamburg.de>
 License: MIT
@@ -30,7 +30,7 @@ Dynamic: license-file
 Reusable parser for AlphaPulldown-style fold specifications. Install it with:
 
 ```bash
-pip install alphapulldown-input-parser
+pip install "alphapulldown-input-parser>=0.4.0"
 ```
 
 or, for local development:
@@ -48,3 +48,17 @@ The package exposes two helpers:
 
 The parser is dependency-free and works across AlphaPulldown, the Snakemake
 pipeline, or any other tooling that consumes the same fold syntax.
+
+As of `0.4.0`, AF3 JSON feature files support the same copy/range suffixes as
+classic AlphaPulldown feature pickles. For example:
+
+```python
+parse_fold(
+    ["P01258_af3_input.json:1-100:2"],
+    features_directory=["/path/to/features"],
+    protein_delimiter="+",
+)
+```
+
+This expands to two folding entries for the same AF3 JSON feature file, each
+restricted to residues `1-100`.

{alphapulldown_input_parser-0.3.0 → alphapulldown_input_parser-0.4.0}/test/test_parser.py

@@ -232,10 +232,40 @@ def patch_feature_index(monkeypatch):
             ["dir1"],
             "+",
             {"pkl": {}, "json": {"protein1.json": "dir1/protein1.json"}},
+            [[{"json_input": "dir1/protein1.json", "regions": selection_ranges((1, 10))}]],
+            None,
+            None,
+            id="json_with_range",
+        ),
+        pytest.param(
+            ["protein1.json:2:1-10:20-30"],
+            ["dir1"],
+            "+",
+            {"pkl": {}, "json": {"protein1.json": "dir1/protein1.json"}},
+            [
+                [
+                    {"json_input": "dir1/protein1.json", "regions": selection_ranges((1, 10), (20, 30))},
+                    {"json_input": "dir1/protein1.json", "regions": selection_ranges((1, 10), (20, 30))},
+                ]
+            ],
+            None,
+            None,
+            id="json_with_copy_and_regions",
+        ),
+        pytest.param(
+            ["protein1.json:1-10:20-30:2"],
+            ["dir1"],
+            "+",
+            {"pkl": {}, "json": {"protein1.json": "dir1/protein1.json"}},
+            [
+                [
+                    {"json_input": "dir1/protein1.json", "regions": selection_ranges((1, 10), (20, 30))},
+                    {"json_input": "dir1/protein1.json", "regions": selection_ranges((1, 10), (20, 30))},
+                ]
+            ],
             None,
-            FormatError,
             None,
-            id="json_with_range_not_supported",
+            id="json_with_regions_and_copy",
         ),
     ],
 )