datajunction 0.0.97__tar.gz → 0.0.99__tar.gz

{datajunction-0.0.97 → datajunction-0.0.99}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datajunction
-Version: 0.0.97
+Version: 0.0.99
 Summary: DataJunction client library for connecting to a DataJunction server
 Project-URL: repository, https://github.com/DataJunction/dj
 Author-email: DataJunction Authors <yian.shang@gmail.com>

{datajunction-0.0.97 → datajunction-0.0.99}/datajunction/__about__.py

@@ -2,4 +2,4 @@
 Version for Hatch
 """
 
-__version__ = "0.0.97"
+__version__ = "0.0.99"

{datajunction-0.0.97 → datajunction-0.0.99}/datajunction/cli.py

@@ -252,11 +252,22 @@ class DJCLI:
         self.builder_client = builder_client
         self.deployment_service = DeploymentService(client=self.builder_client)
 
-    def push(self, directory: str, namespace: str | None = None, verbose: bool = False):
+    def push(
+        self,
+        directory: str,
+        namespace: str | None = None,
+        verbose: bool = False,
+        force: bool = False,
+    ):
         """
         Alias for deploy without dryrun.
         """
-        self.deployment_service.push(directory, namespace=namespace, verbose=verbose)
+        self.deployment_service.push(
+            directory,
+            namespace=namespace,
+            verbose=verbose,
+            force=force,
+        )
 
     def dryrun(
         self,
@@ -875,6 +886,11 @@ class DJCLI:
             action="store_true",
             help="Show all results including noops",
         )
+        deploy_parser.add_argument(
+            "--force",
+            action="store_true",
+            help="Force update all nodes even if they are unchanged",
+        )
 
         # `dj push <directory>` - primary deployment command
         push_parser = subparsers.add_parser(
@@ -901,6 +917,11 @@ class DJCLI:
             action="store_true",
             help="Show all results including noops",
         )
+        push_parser.add_argument(
+            "--force",
+            action="store_true",
+            help="Force update all nodes even if they are unchanged",
+        )
         push_parser.add_argument(
             "--format",
             type=str,
@@ -1301,7 +1322,7 @@ class DJCLI:
                 self.dryrun(args.directory, format=args.format)
                 return
             try:
-                self.push(args.directory, verbose=args.verbose)
+                self.push(args.directory, verbose=args.verbose, force=args.force)
             except DJDeploymentFailure:
                 raise SystemExit(1)
         elif args.command == "push":
@@ -1329,6 +1350,7 @@ class DJCLI:
                     args.directory,
                     namespace=args.namespace,
                     verbose=args.verbose,
+                    force=args.force,
                 )
             except DJDeploymentFailure:
                 raise SystemExit(1)

{datajunction-0.0.97 → datajunction-0.0.99}/datajunction/deployment.py

@@ -249,6 +249,7 @@ class DeploymentService:
         namespace: str | None = None,
         console: Console | None = None,
         verbose: bool = False,
+        force: bool = False,
     ):
         """
         Push a local project to a namespace.
@@ -293,6 +294,8 @@ class DeploymentService:
                     f"[yellow]Warning: could not set git config on namespace "
                     f"'{deployment_spec['namespace']}': {e}[/yellow]",
                 )
+        if force:
+            deployment_spec["force"] = True
         deployment_data = self.client.deploy(deployment_spec)
         deployment_uuid = deployment_data["uuid"]
 

{datajunction-0.0.97 → datajunction-0.0.99}/tests/examples.py

@@ -1469,4 +1469,49 @@ QUERY_DATA_MAPPINGS: Dict[str, Union[DJException, QueryWithResults]] = {
         results=[],
         errors=[],
     ),
+    # v3 API query for avg_repair_price with city dimension (with hard_hat_id in repair_order CTE)
+    # This SQL is generated after the fix-filter-role PR which adds join key columns to CTEs
+    "WITHdefault_hard_hatAS(SELECThard_hat_id,\tcityFROMdefault.roads.hard_hats),"
+    "default_repair_orderAS(SELECTrepair_order_id,\thard_hat_idFROMdefault.repair_orders),"
+    "repair_order_details_0AS(SELECTt3.city,\tCOUNT(t1.price)price_count_252381cf,"
+    "\tSUM(t1.price)price_sum_252381cfFROMdefault.roads.repair_order_detailst1"
+    "LEFTOUTERJOINdefault_repair_ordert2ONt1.repair_order_id=t2.repair_order_id"
+    "LEFTOUTERJOINdefault_hard_hatt3ONt2.hard_hat_id=t3.hard_hat_idGROUPBYt3.city)"
+    "SELECTrepair_order_details_0.cityAScity,\tSUM(repair_order_details_0."
+    "price_sum_252381cf)/SUM(repair_order_details_0.price_count_252381cf)AS"
+    "avg_repair_priceFROMrepair_order_details_0GROUPBYrepair_order_details_0.city": QueryWithResults(
+        id="v3-avg-repair-price-city-with-join-key",
+        submitted_query="...",
+        state=QueryState.FINISHED,
+        results=[
+            {
+                "columns": [
+                    {"name": "city", "type": "str"},
+                    {"name": "avg_repair_price", "type": "float"},
+                ],
+                "rows": [
+                    ("Foo", 1.0),
+                    ("Bar", 2.0),
+                ],
+                "sql": "",
+            },
+        ],
+        errors=[],
+    ),
+    # v3 API query for avg_repair_price with state dimension (with hard_hat_id in repair_order CTE)
+    "WITHdefault_hard_hatAS(SELECThard_hat_id,\tstateFROMdefault.roads.hard_hats),"
+    "default_repair_orderAS(SELECTrepair_order_id,\thard_hat_idFROMdefault.repair_orders),"
+    "repair_order_details_0AS(SELECTt3.state,\tCOUNT(t1.price)price_count_252381cf,"
+    "\tSUM(t1.price)price_sum_252381cfFROMdefault.roads.repair_order_detailst1"
+    "LEFTOUTERJOINdefault_repair_ordert2ONt1.repair_order_id=t2.repair_order_id"
+    "LEFTOUTERJOINdefault_hard_hatt3ONt2.hard_hat_id=t3.hard_hat_idGROUPBYt3.state)"
+    "SELECTrepair_order_details_0.stateASstate,\tSUM(repair_order_details_0."
+    "price_sum_252381cf)/SUM(repair_order_details_0.price_count_252381cf)AS"
+    "avg_repair_priceFROMrepair_order_details_0GROUPBYrepair_order_details_0.state": QueryWithResults(
+        id="v3-avg-repair-price-state-no-data-with-join-key",
+        submitted_query="...",
+        state=QueryState.FINISHED,
+        results=[],
+        errors=[],
+    ),
 }

{datajunction-0.0.97 → datajunction-0.0.99}/tests/test_cli.py

@@ -1679,6 +1679,47 @@ class TestImpactAnalysis:
         # deploy0 has 6 nodes, they should be deployed
         assert len(results) >= 6
 
+    def test_push_force_flag_passed_to_service(self, tmp_path):
+        """--force on `dj push` must propagate force=True to DeploymentService.push."""
+        from datajunction.cli import DJCLI
+
+        cli = DJCLI(builder_client=mock.MagicMock())
+        with patch.object(cli.deployment_service, "push") as mock_push:
+            mock_push.return_value = None
+            with patch.object(sys, "argv", ["dj", "push", str(tmp_path), "--force"]):
+                cli.run()
+
+        mock_push.assert_called_once()
+        _, kwargs = mock_push.call_args
+        assert kwargs.get("force") is True
+
+    def test_deploy_force_flag_passed_to_service(self, tmp_path):
+        """--force on `dj deploy` must propagate force=True to DeploymentService.push."""
+        from datajunction.cli import DJCLI
+
+        cli = DJCLI(builder_client=mock.MagicMock())
+        with patch.object(cli.deployment_service, "push") as mock_push:
+            mock_push.return_value = None
+            with patch.object(sys, "argv", ["dj", "deploy", str(tmp_path), "--force"]):
+                cli.run()
+
+        mock_push.assert_called_once()
+        _, kwargs = mock_push.call_args
+        assert kwargs.get("force") is True
+
+    def test_push_without_force_flag_defaults_false(self, tmp_path):
+        """Omitting --force on `dj push` must pass force=False."""
+        from datajunction.cli import DJCLI
+
+        cli = DJCLI(builder_client=mock.MagicMock())
+        with patch.object(cli.deployment_service, "push") as mock_push:
+            mock_push.return_value = None
+            with patch.object(sys, "argv", ["dj", "push", str(tmp_path)]):
+                cli.run()
+
+        _, kwargs = mock_push.call_args
+        assert kwargs.get("force") is False
+
 
 class TestDJCLIClientCreation:
     """Tests for DJCLI client creation from environment variables."""

{datajunction-0.0.97 → datajunction-0.0.99}/tests/test_deploy.py

@@ -274,6 +274,50 @@ def test_push_waits_until_success(monkeypatch, tmp_path):
     client.check_deployment.assert_called()
 
 
+def test_push_force_sets_flag_in_spec(monkeypatch, tmp_path):
+    """push(force=True) must include {"force": True} in the spec sent to client.deploy."""
+    (tmp_path / "dj.yaml").write_text(yaml.safe_dump({"namespace": "foo"}))
+    (tmp_path / "foo.yaml").write_text(yaml.safe_dump({"name": "foo.bar"}))
+
+    client = MagicMock()
+    client.deploy.return_value = {
+        "uuid": "abc",
+        "status": "success",
+        "results": [],
+        "namespace": "foo",
+    }
+
+    svc = DeploymentService(client, console=Console(file=io.StringIO()))
+    monkeypatch.setattr(time, "sleep", lambda _: None)
+
+    svc.push(tmp_path, force=True)
+
+    spec_sent = client.deploy.call_args[0][0]
+    assert spec_sent.get("force") is True
+
+
+def test_push_without_force_does_not_set_flag(monkeypatch, tmp_path):
+    """push() without force must not include force in the spec (server default handles it)."""
+    (tmp_path / "dj.yaml").write_text(yaml.safe_dump({"namespace": "foo"}))
+    (tmp_path / "foo.yaml").write_text(yaml.safe_dump({"name": "foo.bar"}))
+
+    client = MagicMock()
+    client.deploy.return_value = {
+        "uuid": "abc",
+        "status": "success",
+        "results": [],
+        "namespace": "foo",
+    }
+
+    svc = DeploymentService(client, console=Console(file=io.StringIO()))
+    monkeypatch.setattr(time, "sleep", lambda _: None)
+
+    svc.push(tmp_path)
+
+    spec_sent = client.deploy.call_args[0][0]
+    assert "force" not in spec_sent
+
+
 def test_push_times_out(monkeypatch, tmp_path):
     # minimal project structure so _reconstruct_deployment_spec works
     (tmp_path / "dj.yaml").write_text(yaml.safe_dump({"namespace": "foo"}))