Fix cyclic graph

Author: BenConstable9

deploy_ai_search_indexes/src/deploy_ai_search_indexes/ai_search.py

@@ -245,11 +245,15 @@ def get_mark_up_cleaner_skill(self, chunk_by_page: False) -> WebApiSkill:
             ]
 
         mark_up_cleaner_skill_outputs = [
-            OutputFieldMappingEntry(name="cleaned_text", target_name="cleaned_text"),
-            OutputFieldMappingEntry(name="sections", target_name="sections"),
-            OutputFieldMappingEntry(name="mark_up", target_name="mark_up"),
-            OutputFieldMappingEntry(name="figures", target_name="chunk_figures"),
-            OutputFieldMappingEntry(name="page_number", target_name="page_number"),
+            OutputFieldMappingEntry(
+                name="cleaned_text", target_name="final_cleaned_text"
+            ),
+            OutputFieldMappingEntry(name="sections", target_name="final_sections"),
+            OutputFieldMappingEntry(name="mark_up", target_name="final_mark_up"),
+            OutputFieldMappingEntry(name="figures", target_name="final_chunk_figures"),
+            OutputFieldMappingEntry(
+                name="page_number", target_name="final_page_number"
+            ),
         ]
 
         mark_up_cleaner_skill = WebApiSkill(

deploy_ai_search_indexes/src/deploy_ai_search_indexes/image_processing.py

@@ -188,11 +188,12 @@ def get_skills(self) -> list:
         if self.enable_page_by_chunking:
             embedding_skill = self.get_vector_skill(
                 "/document/page_wise_layout/*",
-                "/document/page_wise_layout/*/cleaned_text",
+                "/document/page_wise_layout/*/final_cleaned_text",
             )
         else:
             embedding_skill = self.get_vector_skill(
-                "/document/chunk_mark_ups/*", "/document/chunk_mark_ups/*/cleaned_text"
+                "/document/chunk_mark_ups/*",
+                "/document/chunk_mark_ups/*/final_cleaned_text",
             )
 
         if self.enable_page_by_chunking:
@@ -223,7 +224,7 @@ def get_index_projections(self) -> SearchIndexerIndexProjection:
             source_context = "/document/page_wise_layout/*"
             mappings = [
                 InputFieldMappingEntry(
-                    name="Chunk", source="/document/page_wise_layout/*/mark_up"
+                    name="Chunk", source="/document/page_wise_layout/*/final_mark_up"
                 ),
                 InputFieldMappingEntry(
                     name="ChunkEmbedding",
@@ -233,24 +234,25 @@ def get_index_projections(self) -> SearchIndexerIndexProjection:
                 InputFieldMappingEntry(name="SourceUri", source="/document/SourceUri"),
                 InputFieldMappingEntry(
                     name="Sections",
-                    source="/document/page_wise_layout/*/sections",
+                    source="/document/page_wise_layout/*/final_sections",
                 ),
                 InputFieldMappingEntry(
                     name="ChunkFigures",
-                    source="/document/page_wise_layout/*/chunk_figures/*",
+                    source="/document/page_wise_layout/*/final_chunk_figures/*",
                 ),
                 InputFieldMappingEntry(
                     name="DateLastModified", source="/document/DateLastModified"
                 ),
                 InputFieldMappingEntry(
-                    name="PageNumber", source="/document/page_wise_layout/*/page_number"
+                    name="PageNumber",
+                    source="/document/page_wise_layout/*/final_page_number",
                 ),
             ]
         else:
             source_context = "/document/chunk_mark_ups/*"
             mappings = [
                 InputFieldMappingEntry(
-                    name="Chunk", source="/document/chunk_mark_ups/*/mark_up"
+                    name="Chunk", source="/document/chunk_mark_ups/*/final_mark_up"
                 ),
                 InputFieldMappingEntry(
                     name="ChunkEmbedding",
@@ -259,17 +261,18 @@ def get_index_projections(self) -> SearchIndexerIndexProjection:
                 InputFieldMappingEntry(name="Title", source="/document/Title"),
                 InputFieldMappingEntry(name="SourceUri", source="/document/SourceUri"),
                 InputFieldMappingEntry(
-                    name="Sections", source="/document/chunk_mark_ups/*/sections"
+                    name="Sections", source="/document/chunk_mark_ups/*/final_sections"
                 ),
                 InputFieldMappingEntry(
                     name="ChunkFigures",
-                    source="/document/chunk_mark_ups/*/chunk_figures/*",
+                    source="/document/chunk_mark_ups/*/final_chunk_figures/*",
                 ),
                 InputFieldMappingEntry(
                     name="DateLastModified", source="/document/DateLastModified"
                 ),
                 InputFieldMappingEntry(
-                    name="PageNumber", source="/document/chunk_mark_ups/*/page_number"
+                    name="PageNumber",
+                    source="/document/chunk_mark_ups/*/final_page_number",
                 ),
             ]