💥 load_proxy -> make_proxy

ftmq/io.py

@@ -18,7 +18,7 @@
 log = logging.getLogger(__name__)
 
 
-def load_proxy(data: dict[str, Any], dataset: str | None = None) -> CE:
+def make_proxy(data: dict[str, Any], dataset: str | None = None) -> CE:
     datasets = ensure_list(data.pop("datasets", None))
     if dataset is not None:
         datasets.append(dataset)
@@ -89,7 +89,7 @@ def smart_read_proxies(
                 break
             data = orjson.loads(line)
             if serialize:
-                data = load_proxy(data)
+                data = make_proxy(data)
             yield data
 
 

tests/test_cli.py

@@ -5,7 +5,7 @@
 from nomenklatura.entity import CompositeEntity
 
 from ftmq.cli import cli
-from ftmq.io import load_proxy
+from ftmq.io import make_proxy
 
 runner = CliRunner()
 
@@ -24,7 +24,7 @@ def test_cli(fixtures_path: Path):
     assert result.exit_code == 0
     lines = _get_lines(result.output)
     assert len(lines) == 151
-    proxy = load_proxy(orjson.loads(lines[0]))
+    proxy = make_proxy(orjson.loads(lines[0]))
     assert isinstance(proxy, CompositeEntity)
 
     result = runner.invoke(cli, ["-i", in_uri, "-d", "other_dataset"])
@@ -65,7 +65,7 @@ def test_cli_apply(fixtures_path: Path):
     assert result.exit_code == 0
     lines = _get_lines(result.output)
     assert len(lines) == 151
-    proxy = load_proxy(orjson.loads(lines[0]))
+    proxy = make_proxy(orjson.loads(lines[0]))
     assert isinstance(proxy, CompositeEntity)
     assert "another_dataset" in proxy.datasets
     assert "eu_authorities" in proxy.datasets
@@ -78,7 +78,7 @@ def test_cli_apply(fixtures_path: Path):
     assert result.exit_code == 0
     lines = _get_lines(result.output)
     assert len(lines) == 151
-    proxy = load_proxy(orjson.loads(lines[0]))
+    proxy = make_proxy(orjson.loads(lines[0]))
     assert isinstance(proxy, CompositeEntity)
     assert "another_dataset" in proxy.datasets
     assert "eu_authorities" not in proxy.datasets
@@ -114,5 +114,5 @@ def test_cli_io(fixtures_path: Path):
     assert result.exit_code == 0
     lines = _get_lines(result.output)
     assert len(lines) == 151
-    proxy = load_proxy(orjson.loads(lines[0]))
+    proxy = make_proxy(orjson.loads(lines[0]))
     assert isinstance(proxy, CompositeEntity)

tests/test_io.py

@@ -6,14 +6,13 @@
 
 from ftmq.io import (
     apply_datasets,
-    load_proxy,
+    make_proxy,
     smart_read,
     smart_read_proxies,
     smart_write,
     smart_write_proxies,
 )
-
-from .conftest import setup_s3
+from tests.conftest import setup_s3
 
 
 def test_io_read(fixtures_path: Path):
@@ -49,7 +48,7 @@ def test_io_write_stdout(capsys, proxies: list[CE]):
     captured = capsys.readouterr()
     proxy = None
     for line in captured.out.split("\n"):
-        proxy = load_proxy(orjson.loads(line))
+        proxy = make_proxy(orjson.loads(line))
         break
     assert isinstance(proxy, CompositeEntity)
 

tests/test_proxy.py

@@ -2,13 +2,13 @@
 from followthemoney import model
 
 from ftmq.exceptions import ValidationError
-from ftmq.io import load_proxy
+from ftmq.io import make_proxy
 from ftmq.query import Query
 
 
 def test_proxy_composite():
     data = {"id": "1", "schema": "Thing", "properties": {"name": "Test"}}
-    proxy = load_proxy(data)
+    proxy = make_proxy(data)
     assert proxy.id == "1"
     assert proxy.get("name") == ["Test"]
     assert proxy.datasets == {"default"}
@@ -19,7 +19,7 @@ def test_proxy_composite():
         "properties": {"name": "Test"},
         "datasets": ["test_dataset"],
     }
-    proxy = load_proxy(data)
+    proxy = make_proxy(data)
     assert proxy.id == "1"
     assert proxy.get("name") == ["Test"]
     assert proxy.datasets == {"test_dataset"}
@@ -30,7 +30,7 @@ def test_proxy_composite():
         "properties": {"name": "Test"},
         "datasets": ["test_dataset", "ds2"],
     }
-    proxy = load_proxy(data, "another_dataset")
+    proxy = make_proxy(data, "another_dataset")
     assert proxy.id == "1"
     assert proxy.get("name") == ["Test"]
     assert proxy.datasets == {"another_dataset", "ds2", "test_dataset"}