Testing 0.0.2 (#343)

* Add .gitignore to exclude temporary files and directories

* Enhance upsert_graph_template function to include store_config and improve error handling

- Added store_config to the GraphTemplate creation process, ensuring comprehensive data handling.
- Improved error handling by refining the structure of the upsert_graph_template function, enhancing robustness and clarity.
- Included debug print statements for graph_template to aid in troubleshooting during development.

* Remove debug print statements from upsert_graph_template function to clean up code and improve readability.

* Update verify_inputs function to skip processing for 'store' identifier

- Added a condition to the verify_inputs function in verify_graph.py to continue the loop when the identifier is 'store', preventing unnecessary processing for this case.

* Skip processing for 'store' identifier in validate_dependencies function

- Added a condition in the validate_dependencies function to continue the loop when the dependent identifier is 'store', preventing unnecessary validation checks for this case.

* Enhance trigger_graph function to validate and process dependent strings

- Added logic to validate dependent strings in the trigger_graph function, ensuring that only valid identifiers are processed and that dependencies exist in the provided store.
- Improved error handling to provide clearer feedback when inputs are invalid, enhancing robustness and user experience.

* Refactor endpoint URLs in runtime and routes to use singular 'state' instead of plural 'states'

- Updated the endpoint construction in the Runtime class to reflect the change from '/states/{state_id}/executed' to '/state/{state_id}/executed' and similarly for the errored endpoint.
- Modified the route definitions in the state-manager to align with the new singular endpoint structure for executed, errored, and prune state routes.

* Refactor PruneSignal to encapsulate data in a dictionary before sending HTTP request

- Updated the PruneSignal class to wrap the data in a dictionary when making the POST request, improving the structure of the request payload.

* Update .gitignore to exclude temporary files and ensure .gitkeep is tracked

- Enhanced .gitignore to ignore all temporary files and directories while ensuring that the .gitkeep file in the temp directory is not ignored, maintaining the directory structure in the repository.
- Improved clarity of the ignore rules for better maintainability.

* Refactor endpoint URLs in tests to use singular 'state' for consistency

- Updated test assertions in `test_runtime_comprehensive.py` and `test_signals_and_runtime_functions.py` to reflect the change from '/states/{state_id}/...' to '/state/{state_id}/...' for executed and errored endpoints.
- Ensured that the data structure in the POST request for prune operations is correctly encapsulated in a dictionary.

* Update test assertions in test_routes.py to reflect singular 'state' endpoint structure

- Modified assertions in the TestRouteStructure class to replace deprecated plural 'states' routes with singular 'state' routes for executed, errored, prune, and re-enqueue-after endpoints.
- Ensured consistency with recent refactoring of endpoint URLs across the codebase.

* Update version to 0.0.2b4 and enhance unit tests for trigger_graph functionality

- Incremented the version in _version.py to 0.0.2b4.
- Added multiple unit tests for the trigger_graph function to cover various scenarios, including handling dependent strings, validation errors, and edge cases with empty or invalid inputs.
- Improved assertions in existing tests to ensure comprehensive coverage and robustness of the trigger_graph functionality.

* Enhance unit tests for create_next_states and verify_graph functions

- Updated the test_create_next_states.py to improve the test for handling empty state_ids, ensuring that a ValueError is raised and the exception handler is verified.
- Expanded test_verify_graph.py with new tests for validation errors, valid graphs, and various input scenarios, ensuring comprehensive coverage of the verify_graph functionality.
- Improved assertions to validate the behavior of the graph template under different conditions, enhancing the robustness of the tests.

* Refactor unit tests to improve clarity and maintainability

- Removed unused imports in test_create_next_states.py to streamline the test file.
- Updated the logger patch in test_verify_graph.py for improved readability and consistency in mocking.

Author: NiveditJain

.gitignore

@@ -0,0 +1,3 @@
+# Ignore temp directory and temp files at repository root
+/temp*
+!/temp/.gitkeep

python-sdk/exospherehost/_version.py

@@ -1 +1 @@
-version = "0.0.2b3"
+version = "0.0.2b4"

python-sdk/exospherehost/runtime.py

@@ -141,13 +141,13 @@ def _get_executed_endpoint(self, state_id: str):
         """
         Construct the endpoint URL for notifying executed states.
         """
-        return f"{self._state_manager_uri}/{str(self._state_manager_version)}/namespace/{self._namespace}/states/{state_id}/executed"
+        return f"{self._state_manager_uri}/{str(self._state_manager_version)}/namespace/{self._namespace}/state/{state_id}/executed"
 
     def _get_errored_endpoint(self, state_id: str):
         """
         Construct the endpoint URL for notifying errored states.
         """
-        return f"{self._state_manager_uri}/{str(self._state_manager_version)}/namespace/{self._namespace}/states/{state_id}/errored"
+        return f"{self._state_manager_uri}/{str(self._state_manager_version)}/namespace/{self._namespace}/state/{state_id}/errored"
 
     def _get_register_endpoint(self):
         """

python-sdk/exospherehost/signals.py

@@ -27,8 +27,11 @@ async def send(self, endpoint: str, key: str):
         Raises:
             Exception: If the HTTP request fails (status code != 200).
         """
+        body = {
+            "data": self.data
+        }
         async with ClientSession() as session:
-            async with session.post(endpoint, json=self.data, headers={"x-api-key": key}) as response:
+            async with session.post(endpoint, json=body, headers={"x-api-key": key}) as response:
                 if response.status != 200:
                     raise Exception(f"Failed to send prune signal to {endpoint}")
 

python-sdk/tests/test_runtime_comprehensive.py

@@ -192,13 +192,13 @@ def test_get_enque_endpoint(self, runtime_config):
     def test_get_executed_endpoint(self, runtime_config):
         runtime = Runtime(**runtime_config)
         endpoint = runtime._get_executed_endpoint("state123")
-        expected = "http://localhost:8080/v1/namespace/test_namespace/states/state123/executed"
+        expected = "http://localhost:8080/v1/namespace/test_namespace/state/state123/executed"
         assert endpoint == expected
 
     def test_get_errored_endpoint(self, runtime_config):
         runtime = Runtime(**runtime_config)
         endpoint = runtime._get_errored_endpoint("state123")
-        expected = "http://localhost:8080/v1/namespace/test_namespace/states/state123/errored"
+        expected = "http://localhost:8080/v1/namespace/test_namespace/state/state123/errored"
         assert endpoint == expected
 
     def test_get_register_endpoint(self, runtime_config):

python-sdk/tests/test_signals_and_runtime_functions.py

@@ -95,7 +95,7 @@ async def test_prune_signal_send_success(self):
         # Verify the request was made correctly
         mock_session.post.assert_called_once_with(
             "http://test-endpoint/prune",
-            json=data,
+            json={"data": data},
             headers={"x-api-key": "test-api-key"}
         )
 
@@ -270,7 +270,7 @@ async def test_signal_handling_direct(self):
         # Verify prune endpoint was called correctly
         mock_session.post.assert_called_once_with(
             runtime._get_prune_endpoint("test-state"),
-            json={"reason": "direct_test"},
+            json={"data": {"reason": "direct_test"}},
             headers={"x-api-key": "test-key"}
         )
 

state-manager/app/controller/trigger_graph.py

@@ -8,6 +8,7 @@
 from app.models.db.run import Run
 from app.models.db.graph_template_model import GraphTemplate
 from app.models.node_template_model import NodeTemplate
+from app.models.dependent_string import DependentString
 import uuid
 
 logger = LogsManager().get_logger()
@@ -41,6 +42,30 @@ async def trigger_graph(namespace_name: str, graph_name: str, body: TriggerGraph
 
         if not graph_template.is_valid():
             raise HTTPException(status_code=400, detail="Graph template is not valid")
+        
+        root = graph_template.get_root_node()
+        inputs = construct_inputs(root, body.inputs)
+
+        try:
+            for field, value in inputs.items():
+                dependent_string = DependentString.create_dependent_string(value)
+
+                for dependent in dependent_string.dependents.values():
+                    if dependent.identifier != "store":
+                        raise HTTPException(status_code=400, detail=f"Root node can have only store identifier as dependent but got {dependent.identifier}")
+                    elif dependent.field not in body.store:
+                        if dependent.field in graph_template.store_config.default_values.keys():
+                            dependent_string.set_value(dependent.identifier, dependent.field, graph_template.store_config.default_values[dependent.field])
+                        else:
+                            raise HTTPException(status_code=400, detail=f"Dependent {dependent.field} not found in store for root node {root.identifier}")
+                    else:
+                        dependent_string.set_value(dependent.identifier, dependent.field, body.store[dependent.field])
+
+                inputs[field] = dependent_string.generate_string()
+
+        except Exception as e:
+            raise HTTPException(status_code=400, detail=f"Invalid input: {e}")
+
 
         check_required_store_keys(graph_template, body.store)
 
@@ -64,16 +89,14 @@ async def trigger_graph(namespace_name: str, graph_name: str, body: TriggerGraph
         if len(new_stores) > 0:
             await Store.insert_many(new_stores)
 
-        root = graph_template.get_root_node()
-
         new_state = State(
             node_name=root.node_name,
             namespace_name=namespace_name,
             identifier=root.identifier,
             graph_name=graph_name,
             run_id=run_id,
             status=StateStatusEnum.CREATED,
-            inputs=construct_inputs(root, body.inputs),
+            inputs=inputs,
             outputs={},
             error=None
         )

state-manager/app/controller/upsert_graph_template.py

@@ -15,7 +15,7 @@ async def upsert_graph_template(namespace_name: str, graph_name: str, body: Upse
             GraphTemplate.name == graph_name,
             GraphTemplate.namespace == namespace_name
         )
-
+               
         try:
             if graph_template:
                 logger.info(
@@ -28,7 +28,8 @@ async def upsert_graph_template(namespace_name: str, graph_name: str, body: Upse
                         GraphTemplate.nodes: body.nodes, # type: ignore
                         GraphTemplate.validation_status: GraphTemplateValidationStatus.PENDING, # type: ignore
                         GraphTemplate.validation_errors: [], # type: ignore
-                        GraphTemplate.retry_policy: body.retry_policy # type: ignore
+                        GraphTemplate.retry_policy: body.retry_policy, # type: ignore
+                        GraphTemplate.store_config: body.store_config # type: ignore
                     })
                 )
 
@@ -46,7 +47,8 @@ async def upsert_graph_template(namespace_name: str, graph_name: str, body: Upse
                         nodes=body.nodes,
                         validation_status=GraphTemplateValidationStatus.PENDING,
                         validation_errors=[],
-                        retry_policy=body.retry_policy
+                        retry_policy=body.retry_policy,
+                        store_config=body.store_config
                     ).set_secrets(body.secrets)
                 )
         except ValueError as e:

state-manager/app/routes.py

@@ -92,7 +92,7 @@ async def trigger_graph_route(namespace_name: str, graph_name: str, body: Trigge
     return await trigger_graph(namespace_name, graph_name, body, x_exosphere_request_id)
 
 @router.post(
-    "/states/{state_id}/executed",
+    "/state/{state_id}/executed",
     response_model=ExecutedResponseModel,
     status_code=status.HTTP_200_OK,
     response_description="State executed successfully",
@@ -112,7 +112,7 @@ async def executed_state_route(namespace_name: str, state_id: str, body: Execute
 
 
 @router.post(
-    "/states/{state_id}/errored",
+    "/state/{state_id}/errored",
     response_model=ErroredResponseModel,
     status_code=status.HTTP_200_OK,
     response_description="State errored successfully",
@@ -132,7 +132,7 @@ async def errored_state_route(namespace_name: str, state_id: str, body: ErroredR
 
 
 @router.post(
-    "/states/{state_id}/prune",
+    "/state/{state_id}/prune",
     response_model=SignalResponseModel,
     status_code=status.HTTP_200_OK,
     response_description="State pruned successfully",
@@ -151,7 +151,7 @@ async def prune_state_route(namespace_name: str, state_id: str, body: PruneReque
 
 
 @router.post(
-    "/states/{state_id}/re-enqueue-after",
+    "/state/{state_id}/re-enqueue-after",
     response_model=SignalResponseModel,
     status_code=status.HTTP_200_OK,
     response_description="State re-enqueued successfully",

state-manager/app/tasks/create_next_states.py

@@ -70,6 +70,8 @@ def validate_dependencies(next_state_node_template: NodeTemplate, next_state_inp
         dependency_string = DependentString.create_dependent_string(next_state_node_template.inputs[field_name])
 
         for dependent in dependency_string.dependents.values():
+            if dependent.identifier == "store":
+                continue
             # 2) For each placeholder, verify the identifier is either current or present in parents
             if dependent.identifier != identifier and dependent.identifier not in parents:
                 raise KeyError(f"Identifier '{dependent.identifier}' not found in parents for template '{next_state_node_template.identifier}'")