Merge pull request buerokratt#929 from 1AhmedYasser/fix-blob-storage-update

Fix: Blob Storage Update on Status Change From Active

Author: ffrose

DSL/Ruuter/services/POST/services/edit.yml

@@ -229,9 +229,59 @@ service_edit:
 check for_state:
   switch:
     - condition: ${state === 'draft'}
-      next: change_state_to_draft
+      next: check_remove_blob_then_draft
     - condition: ${state === 'active'}
       next: check_if_service_data_exists
+  next: check_remove_blob_then_ok
+
+check_remove_blob_then_draft:
+  switch:
+    - condition: ${old_state === 'active'}
+      next: delete_from_storage_edit
+  next: change_state_to_draft
+
+check_remove_blob_then_ok:
+  switch:
+    - condition: ${old_state === 'active'}
+      next: delete_from_storage_edit
+  next: return_ok
+
+delete_from_storage_edit:
+  call: http.delete
+  args:
+    url: "[#STORAGE_FERRY]/v1/files/delete"
+    body:
+      files:
+        - storageAccountId: "[#STORAGE_FERRY_ACCOUNT_ID]"
+          container: "[#STORAGE_FERRY_CONTAINER]"
+          fileName: "${old_name}.json"
+  result: ferry_delete_result
+  next: check_if_azure_configured_after_delete_edit
+
+check_if_azure_configured_after_delete_edit:
+  switch:
+    - condition: ${"[#AZURE_SEARCH_SERVICE_NAME]" !== "" && "[#AZURE_SEARCH_INDEXER_NAME]" !== "" && "[#AZURE_SEARCH_API_KEY]" !== ""}
+      next: trigger_azure_indexer_after_delete_edit
+  next: log_azure_not_configured_after_delete_edit
+
+log_azure_not_configured_after_delete_edit:
+  log: "Warning! Azure Search configuration not found. Skipping Azure indexer trigger. Please configure AZURE_SEARCH_SERVICE_NAME, AZURE_SEARCH_INDEXER_NAME, and AZURE_SEARCH_API_KEY in constants.ini"
+  next: after_delete_from_storage_edit
+
+trigger_azure_indexer_after_delete_edit:
+  call: http.post
+  args:
+    url: "https://[#AZURE_SEARCH_SERVICE_NAME].search.windows.net/indexers/[#AZURE_SEARCH_INDEXER_NAME]/run?api-version=2024-07-01"
+    headers:
+      api-key: "[#AZURE_SEARCH_API_KEY]"
+      Content-Type: "application/json"
+  result: azure_indexer_result
+  next: after_delete_from_storage_edit
+
+after_delete_from_storage_edit:
+  switch:
+    - condition: ${state === 'draft'}
+      next: change_state_to_draft
   next: return_ok
 
 change_state_to_draft:

DSL/Ruuter/services/POST/services/status.yml

@@ -206,7 +206,7 @@ deactivate_service:
   next: delete_from_storage
 
 delete_from_storage:
-  call: http.post
+  call: http.delete
   args:
     url: "[#STORAGE_FERRY]/v1/files/delete"
     body:

docs/INTENT_CLASSIFICATION.MD

@@ -21,14 +21,14 @@ Intent files are published to Azure Blob Storage and indexed for LLM-based inten
 
 **In `edit.yml`:**
 
-- Blob storage operations occur **only when the service state is being set to 'active'**
-- When a service is edited and the state is set to 'active', the intent file (JSON format) is uploaded or updated in Azure Blob Storage using Storage Ferry
+- When a service is edited and the state is set to **'active'**, the intent file (JSON format) is uploaded or updated in Azure Blob Storage using Storage Ferry
+- When a service is edited and the state is changed **from active to draft or ready** (or any other non-active status), the intent file is deleted from blob storage
 - The file is stored with the service name as the filename (e.g., `service-name.json`)
 
 **In `status.yml`:**
 
 - When a service is **activated** (state changed to 'active'): the intent file is created in blob storage
-- When a service is **deactivated** (state changed to inactive): the intent file is deleted from blob storage
+- When a service changes **from active to any other status** (e.g. inactive or draft): the intent file is deleted from blob storage
 
 **Blob storage operations:**
 
@@ -264,3 +264,50 @@ Currently, we had low test sample size during development making testing results
 ### Follow-up note.
 
 As in its current iteration we have only basic MVP version, some aspects of this procedure are still raw and inconsistent, and with its development this document should be updated accordingly.
+
+
+## 9. Local Development Notes
+
+#### To Access Azrite in Terminal
+
+- Install az cli
+- To view blob list in a container 
+```
+az storage blob list --container-name {CONTAINER_NAME} --connection-string "DefaultEndpointsProtocol=http;AccountName={ACCOUNT_NAME};AccountKey={ACCOUNT_KEY};BlobEndpoint={ENDPOINT}" --auth-mode key --output table
+```
+- To View blob json content
+```
+view_blob_temp() {
+    local container=$1
+    local blob=$2
+    local temp_file="./temp_$blob"
+    
+    # Download
+    echo "📥 Downloading $blob..."
+    az storage blob download --container-name "$container" --name "$blob" --file "$temp_file" --connection-string "DefaultEndpointsProtocol=http;AccountName={ACCOUNT_NAME};AccountKey={ACCOUNT_KEY};BlobEndpoint={ENDPOINT}" --auth-mode key
+    
+    # View
+    echo -e "\n📄 Contents:"
+    cat "$temp_file"
+    
+    # Ask to keep or remove
+    echo -e "\n\nDelete temporary file? (y/n)"
+    read answer
+    if [ "$answer" = "y" ]; then
+        rm "$temp_file"
+        echo "🗑️  Temporary file removed"
+    else
+        echo "💾 File saved as: $temp_file"
+    fi
+}
+
+# Usage
+view_blob_temp {CONTAINER_NAME} "{NAME}.json"
+```
+- To delete blobs list
+```
+az storage blob list --container-name buerokratt --query "[].name" --output tsv --connection-string "DefaultEndpointsProtocol=http;AccountName={ACCOUNT_NAME};AccountKey={ACCOUNT_KEY};BlobEndpoint={ENDPOINT}" --auth-mode key | while read blob; do
+    echo "Deleting $blob..."
+    az storage blob delete --container-name buerokratt --name "$blob" --connection-string "DefaultEndpointsProtocol=http;AccountName={ACCOUNT_NAME};AccountKey={ACCOUNT_KEY};BlobEndpoint={ENDPOINT}" --auth-mode key
+done
+```