floe-python 0.10.0__py3-none-any.whl → 0.10.1__py3-none-any.whl

floe/add_entity.py

@@ -367,6 +367,9 @@ def _included_domain(
                 raise FloeConfigError(f"failed to parse domain file {file}: {e}") from e
             doc = docs[0] if docs else None
             if isinstance(doc, dict) and cast(Hash, doc).get("name") == domain:
+                # ponytail: a sibling would not load; writing into the glob's folder is the upgrade
+                if "entities" in doc:
+                    raise FloeConfigError(f"domain file {file} sets entities; add-entity writes only sibling entity files, so create this one by hand")  # fmt: skip
                 return os.path.dirname(file), cast(Hash, doc).get("defaults", {})
     return None
 

floe/config/include.py

@@ -30,6 +30,21 @@ def glob_base(directory: Path) -> str:
     return Pattern.escape(text)
 
 
+def _entity_files(domain: Hash, domain_file: Path) -> list[Path]:
+    """Its `entities` glob (#1213) if the domain file sets one, else its sibling `*.yml` files."""
+    directory = domain_file.parent
+    if "entities" not in domain:
+        files = [p for p in directory.iterdir() if p.suffix == ".yml"]
+    else:
+        pattern = yaml_string(domain.pop("entities"), "domains.entities")
+        files = [Path(m) for m in glob(os.path.join(glob_base(directory), pattern))]
+        if not files:
+            raise FloeConfigError(
+                f"domains.entities pattern {pattern!r} matched no file"
+            )
+    return sorted(p for p in files if p.resolve() != domain_file.resolve())
+
+
 def assemble_includes(
     doc: object, config_dir: Path, config_files: list[Path]
 ) -> IncludeOrigins:
@@ -80,17 +95,13 @@ def assemble_includes(
         for match in matches:
             domain_file = Path(match)
             with at_file(domain_file):
-                domain = load_single_doc(domain_file)
-                name = get_string(yaml_hash(domain, "domains"), "name", "domains")
+                domain = yaml_hash(load_single_doc(domain_file), "domains")
+                name = get_string(domain, "name", "domains")
+                entity_files = _entity_files(domain, domain_file)
             config_files.append(domain_file)
             domains.append((domain, domain_file))
             # D4: an entity's name comes from its YAML, never from its file name, so `con.yml` loads like any other
-            siblings = [
-                p
-                for p in domain_file.parent.iterdir()
-                if p != domain_file and p.suffix == ".yml"
-            ]
-            for entity_file in sorted(siblings):
+            for entity_file in entity_files:
                 with at_file(entity_file):
                     loaded = load_single_doc(entity_file)
                     if not isinstance(loaded, dict):

{floe_python-0.10.0.dist-info → floe_python-0.10.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: floe-python
-Version: 0.10.0
+Version: 0.10.1
 Summary: Floe: a data-contract runtime for file ingestion
 License-File: LICENSE
 Requires-Python: >=3.11

{floe_python-0.10.0.dist-info → floe_python-0.10.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ floe/__init__.py,sha256=lskEWBsQyadsBTuU15HGnlQlj_xgxOYkntfYz11QbvY,13450
 floe/__main__.py,sha256=Nzz6wrGXRpJiO59qlX7WEJRTlb-XcRFswmP0TA2KjyM,57
 floe/_cli.py,sha256=cKg3idqFG4PgPEoBixPx9A82_Uhxml5AJTFtGziB094,14592
 floe/_cli_output.py,sha256=6DBAR3cNW2kFW_QGkwP1PpVC8AbvOjQW1LMaGnmC3qs,9232
-floe/add_entity.py,sha256=t7PvMs-Hi2a5GzWhZ-73VErOjJIFeEZroTNK4em0sog,21954
+floe/add_entity.py,sha256=Ih613ZdoKUFBMcIf09BgEZg82Lc-AGsHoxd1HEpw-JI,22257
 floe/errors.py,sha256=wRm6PvrEfIz16YZR06lEGxwNhpbrIPbfMXV2hxMTgdM,586
 floe/extras.py,sha256=H8cYWz1aV99Y9ClcejFfGXW5n08sIoeLAkoSt0TK8E4,613
 floe/glob.py,sha256=A0HdePLXLGl1T6heJbgdrNHr8pZfdidG7pQ1QsXWOl8,10579
@@ -19,7 +19,7 @@ floe/checks/rows.py,sha256=_DsRfPm5ke_yujzM-4F5ToQY6aAa5RVJQCGpZpyCkDc,4666
 floe/checks/unique.py,sha256=ZVckMOoGuKIzq3M84TGeZ1ks0nab9YTaI54w5Q_rjZc,10864
 floe/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 floe/config/entity.py,sha256=1G9_Oguo5Jp4X1SOsjDuu9A6Hs1HZnvbVk7DruA_Swg,16076
-floe/config/include.py,sha256=4LjX4fDcH6Icl_ax4KrnrMHwJjTif0A0vu022zSfBm0,4987
+floe/config/include.py,sha256=59EJBE7yGJkBjCYzmwnWkhmuWGm8r5uaGaFxf_F0XS4,5573
 floe/config/parse.py,sha256=B3gOi80-M0y9Y4OyNjM4MYmM2mFHKGVpqipX1JqaLjM,5290
 floe/config/profile.py,sha256=GkqJDfDTmvCkK1ZxTlIdHgQJOt1PS-5_qYnOkMzIf0U,18561
 floe/config/project.py,sha256=hrSBVeyirWHODYXzHTil8iR5ZvjpvpL_eYNjmHW5qrg,14584
@@ -65,8 +65,8 @@ floe/storage/s3.py,sha256=PW11xRl8xzyf4ntM-w51eDW14CVd66pCqsaMXpkftPw,9499
 floe/storage/types.py,sha256=nmBJ1aMkBFCv4UFFoDJoci5BxC6cKRvLw_eNl-DKLlM,1254
 floe/write/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 floe/write/outputs.py,sha256=NTCfLzna0B6-VJS9izh-3wrphVbsLTCaHLf1rV-Ls6w,8301
-floe_python-0.10.0.dist-info/METADATA,sha256=6C4XBJJ8SlLs4BPW9-7HRvYvUGfS9B19gTbkZimqYyU,881
-floe_python-0.10.0.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
-floe_python-0.10.0.dist-info/entry_points.txt,sha256=DU75r-E3zcK0quvwg5iT5DeWbUJck_Tz80bEj1IIzHA,40
-floe_python-0.10.0.dist-info/licenses/LICENSE,sha256=dUhuoK-TCRQMpuLEAdfme-qPSJI0TlcH9jlNxeg9_EQ,1056
-floe_python-0.10.0.dist-info/RECORD,,
+floe_python-0.10.1.dist-info/METADATA,sha256=6ZOBOwKEQmPH-KxjTTzn5mdiKf3u9nYVBmueOnN-x_Q,881
+floe_python-0.10.1.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
+floe_python-0.10.1.dist-info/entry_points.txt,sha256=DU75r-E3zcK0quvwg5iT5DeWbUJck_Tz80bEj1IIzHA,40
+floe_python-0.10.1.dist-info/licenses/LICENSE,sha256=dUhuoK-TCRQMpuLEAdfme-qPSJI0TlcH9jlNxeg9_EQ,1056
+floe_python-0.10.1.dist-info/RECORD,,