splight-cli 4.1.0.dev0__py3-none-any.whl → 4.1.0.dev2__py3-none-any.whl

cli/solution/apply_exec.py

@@ -51,7 +51,7 @@ class ApplyExecutor:
             local_instance.save()
             remote_instance = model.retrieve(resource_id=local_instance.id)
             return ApplyResult(True, to_dict(remote_instance))
-        return ApplyResult(False, None)
+        return ApplyResult(False, to_dict(local_instance))
 
     def replace_data_addr(self):
         """Replaces assets data addresses in component's routines."""
@@ -171,7 +171,7 @@ class ApplyExecutor:
                     "Do you want to update the local instance?"
                 )
                 if update:
-                    return ApplyResult(True, remote_instance)
+                    return ApplyResult(True, to_dict(remote_instance))
                 bprint(
                     f"\nYou are about to override the remote {model_name} "
                     f"with your local {model_name}:"
@@ -181,12 +181,12 @@ class ApplyExecutor:
                 if update:
                     local_instance.save()
                     return ApplyResult(True, to_dict(local_instance))
-                return ApplyResult(False, None)
+                return ApplyResult(False, to_dict(local_instance))
             bprint(
                 f"Nothing to update, the same {model_name} was found "
                 "remotely"
             )
-            return ApplyResult(False, None)
+            return ApplyResult(False, to_dict(local_instance))
         bprint(f"\nThe following {model_name} was not found remotely")
         print(local_instance)
         self._remove_ids(model_name, local_instance)
@@ -197,7 +197,7 @@ class ApplyExecutor:
             local_instance.save()
             remote_instance = model.retrieve(resource_id=local_instance.id)
             return ApplyResult(True, to_dict(remote_instance))
-        return ApplyResult(False, None)
+        return ApplyResult(False, to_dict(local_instance))
 
     def _remove_ids(self, model: SplightTypes, local_instance: SplightTypes):
         """Removes ids to a given dictionary representing a particular model.

cli/solution/solution.py

@@ -48,14 +48,14 @@ class SolutionManager:
         )
 
     def execute(self):
-        console.print("\nStarting plan step...", style=PRINT_STYLE)
-        self._generate_assets_state()
-        self._generate_components_state()
-
         if self._apply:
             console.print("\nStarting apply step...", style=PRINT_STYLE)
             self._apply_assets_state()
             self._apply_components_state()
+        else:
+            console.print("\nStarting plan step...", style=PRINT_STYLE)
+            self._generate_assets_state()
+            self._generate_components_state()
 
     def _generate_state_from_plan(self):
         """Generates the state file if not passed."""
@@ -105,12 +105,12 @@ class SolutionManager:
                 model=Component, local_instance=component
             )
             if result.update:
-                updated_routines = self._apply_routines_state(
-                    component, Component.parse_obj(result.updated_dict)
-                )
                 components_list[i] = Component.parse_obj(result.updated_dict)
-                components_list[i].routines = updated_routines
                 save_yaml(self._state_path, self._state)
+            components_list[i].routines = self._apply_routines_state(
+                component, Component.parse_obj(result.updated_dict)
+            )
+            save_yaml(self._state_path, self._state)
 
     def _apply_routines_state(
         self, component: Component, updated_component: Component

cli/version.py

@@ -1 +1 @@
-__version__ = "4.1.0.dev0"
+__version__ = "4.1.0.dev2"

{splight_cli-4.1.0.dev0.dist-info → splight_cli-4.1.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: splight-cli
-Version: 4.1.0.dev0
+Version: 4.1.0.dev2
 Summary: CLI tool to build and run Splight components
 Home-page: UNKNOWN
 Author: Splight
@@ -12,6 +12,7 @@ Requires-Dist: case-converter (==1.1.0)
 Requires-Dist: click-default-group (==1.2.2)
 Requires-Dist: click (==8.0.4)
 Requires-Dist: colorama (==0.4.4)
+Requires-Dist: deepdiff (==6.3.1)
 Requires-Dist: packaging (==23.0)
 Requires-Dist: pathspec (==0.11.1)
 Requires-Dist: py7zr (==0.18.5)

{splight_cli-4.1.0.dev0.dist-info → splight_cli-4.1.0.dev2.dist-info}/RECORD

@@ -2,7 +2,7 @@ cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cli/cli.py,sha256=BgukRST8EW6HD6SP5Gl8hRgwNh7fWFQIAOfE9mKwOBo,1069
 cli/constants.py,sha256=ope-1uVfI3yZgNV1HdZdJBTgZE1Bq7Mnh6xYywps1B8,1577
 cli/settings.py,sha256=wNPC6RLbJzXqPNzin-sK9hjK-24J6mFbpfy27I3MeOc,653
-cli/version.py,sha256=UhSsUCodiTuRFFVYGXXoYLZx6uBltrkzVn1SdgxH8Pk,27
+cli/version.py,sha256=_aYM-eunKzi_sRQpcwMN0dIwV7qeUX5JHmtrFwTo_iA,27
 cli/component/__init__.py,sha256=leYcpVgpJ5yEpfdPBAACXeqnlTLKaQBVH1Durd-LRBE,4538
 cli/component/component.py,sha256=UR3zzjo5y0iJ_d7JzmSmSczyxg0m7FYcTFoyJD9vGig,8289
 cli/component/exceptions.py,sha256=936K_NhkvvdpKWeQrY80CFn2eMi2BUSw324vCJvM9Mo,1521
@@ -38,10 +38,10 @@ cli/hub/component/__init__.py,sha256=m7y73pD5QHDul24zJLcNKWQ_ZqSU3nE2PJmaGkwrO2Q
 cli/hub/component/exceptions.py,sha256=DCrGkGk3OxhajYbt5O96qfEplKbXAQxvUkIR6erBU1E,1264
 cli/hub/component/hub_manager.py,sha256=494oI76XN6E6u8-cBgrlW2OumcfeeYWLCx6wJLBq8aw,4614
 cli/solution/__init__.py,sha256=DieGf7zxL8H_Vg2XoKSiwFLSeJrbF3R4BsDBtF_uSu0,1488
-cli/solution/apply_exec.py,sha256=f93Wh4qlHWGkMdHG0GKnjHxiGSHQOH4fSC9xJNru1I0,7499
+cli/solution/apply_exec.py,sha256=3XoK_Dn7qmf4fgNxWtbJcEU9BDOG7O4fZxRjVuuEoY4,7584
 cli/solution/models.py,sha256=FEpcGw6R5OTkElSbvrCEnwWOj2fiG5R6EkH4V9qSoX8,1224
 cli/solution/plan_exec.py,sha256=jmslF6EqbllX38Z_qWoWsGaDQrw01EblrO60HUnalzg,5051
-cli/solution/solution.py,sha256=Dv7Tt6VdCu0v7hTLTkS4Ml-9u8gFfT07whRXI3gLy-c,4677
+cli/solution/solution.py,sha256=Z4XWf8-XIzsnWcT3WEwXJYTN0Dhl512qZkaaHhYB_A0,4691
 cli/solution/utils.py,sha256=2phat3fT3cYnDxsex83x1OunSWSZXfHcgbva70VKeKQ,3853
 cli/utils/__init__.py,sha256=lZg1_NuB7SC5YZvt_jfwgY67OBD-Uj-nD7-c6FrnkKM,299
 cli/utils/input.py,sha256=lDNUtrWEtJGjLLCIfGA3M_8KCBRw8M4gTj4ndyKnhb8,2692
@@ -51,8 +51,8 @@ cli/utils/pprint.py,sha256=q2-UizF_Zq4etoJnZKr9XUNL4Nsu6jbY_bn-QpGr8z8,1079
 cli/utils/template.py,sha256=D6YgaT-7OxOvLdS8TT33hlT0Qe9NAPE1t5_QQiQZniM,436
 cli/utils/yaml.py,sha256=jhNdQa_ExlSaXsPnlfLKKMOKbF1fJLpx0o264AdCNrg,754
 cli/workspace/__init__.py,sha256=oQfZtfGIAQckbnuY74nXbfdqIij3h2g3lomtKh6D8v8,2831
-splight_cli-4.1.0.dev0.dist-info/METADATA,sha256=8EQo5mixKFGMkxrgPsyZryUdfCSIPC4zYujdvAbbiHc,1290
-splight_cli-4.1.0.dev0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-splight_cli-4.1.0.dev0.dist-info/entry_points.txt,sha256=IDM6zGhinztZLBDM4bx17B1Bw7Ruo2_yzEa91Fe8i2Y,41
-splight_cli-4.1.0.dev0.dist-info/top_level.txt,sha256=HmpDxSFAbd4V_5A36MKSqpOO_JlkyBLYDfR8F8Vjp7E,12
-splight_cli-4.1.0.dev0.dist-info/RECORD,,
+splight_cli-4.1.0.dev2.dist-info/METADATA,sha256=AZOC8cXgVWGGUHRYCcJgrr87jNi3YO1Fg-jI0o5wK7k,1324
+splight_cli-4.1.0.dev2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+splight_cli-4.1.0.dev2.dist-info/entry_points.txt,sha256=IDM6zGhinztZLBDM4bx17B1Bw7Ruo2_yzEa91Fe8i2Y,41
+splight_cli-4.1.0.dev2.dist-info/top_level.txt,sha256=HmpDxSFAbd4V_5A36MKSqpOO_JlkyBLYDfR8F8Vjp7E,12
+splight_cli-4.1.0.dev2.dist-info/RECORD,,