sync: update from internal GitLab repository

Content updated:

Files:
- module.xml

Directories:
- scripts/
- objectscript/
- tests/

Synced at: 2025-08-03 07:28:14

Author: tom-dyar

module.xml

@@ -10,6 +10,14 @@
       <SourcesRoot>objectscript</SourcesRoot>
       <Resource Name="RAG.PKG"/>
 
+      <!-- Dependencies -->
+      <Dependencies>
+        <ModuleReference>
+          <Name>%ZPM</Name>
+          <Version>1.0.0</Version>
+        </ModuleReference>
+      </Dependencies>
+      
       <!-- Installation Lifecycle -->
       <Lifecycle>
         <Setup>RAG.IPMInstaller.Setup</Setup>

objectscript/RAG/IFindSetup.CLS

@@ -16,15 +16,6 @@ ClassMethod CreateIFindTable() As %Status
         }
 
         Write "✅ iFind table class compiled successfully",!
-        
-        // Test that the table was created
-        &sql(SELECT COUNT(*) INTO :count FROM RAG.SourceDocumentsWithIFind)
-        If SQLCODE = 0 {
-            Write "✅ Table created and accessible",!
-        } Else {
-            Write "Table creation verification failed: SQLCODE=", SQLCODE,!
-        }
-        
         Return $$$OK
 
     } Catch ex {
@@ -39,6 +30,13 @@ ClassMethod CopyDataToIFindTable() As %Status
     Try {
         Write "Copying data to iFind table...",!
 
+        // Check if source table exists first
+        &sql(SELECT COUNT(*) INTO :sourceCount FROM RAG.SourceDocuments)
+        If SQLCODE '= 0 {
+            Write "Source table RAG.SourceDocuments not found, skipping copy",!
+            Return $$$OK
+        }
+        
         // Use INSERT with explicit column mapping for compatibility
         &sql(INSERT INTO RAG.SourceDocumentsWithIFind 
              (doc_id, title, text_content, authors, keywords, embedding, created_at)
@@ -59,43 +57,6 @@ ClassMethod CopyDataToIFindTable() As %Status
     }
 }
 
-/// Test iFind search using %FIND
-ClassMethod TestIFindSearch(searchText As %String) As %Status
-{
-    Try {
-        Write !,"Searching for: ", searchText,!,!
-        
-        &sql(DECLARE C1 CURSOR FOR
-             SELECT TOP 10 doc_id, title
-             FROM RAG.SourceDocumentsWithIFind
-             WHERE %FIND(text_content, :searchText) > 0)
-        
-        &sql(OPEN C1)
-        
-        Set count = 0
-        For {
-            &sql(FETCH C1 INTO :docId, :title)
-            Quit:SQLCODE'=0
-            
-            Set count = count + 1
-            Write count, ". ", docId, " - ", title,!
-        }
-        
-        &sql(CLOSE C1)
-        
-        If count = 0 {
-            Write "No results found",!
-        } Else {
-            Write !,"Found ", count, " documents",!
-        }
-        
-        Return $$$OK
-        
-    } Catch ex {
-        Write "Error: ", ex.DisplayString(),!
-        Return ex.AsStatus()
-    }
-}
 
 /// Main setup method
 ClassMethod Setup() As %Status
@@ -106,18 +67,12 @@ ClassMethod Setup() As %Status
     Set sc = ..CreateIFindTable()
     If $$$ISERR(sc) Return sc
 
-    // Step 2: Copy data
+    // Step 2: Copy data if source exists
     Set sc = ..CopyDataToIFindTable()
     If $$$ISERR(sc) Return sc
 
-    // Step 3: Test
-    Write !,"Testing iFind search...",!
-    Set sc = ..TestIFindSearch("diabetes")
-    
     Write !,"✅ Setup complete!",!
-    Write "Update hybrid_ifind_rag/pipeline.py to use:",!
-    Write "  FROM RAG.SourceDocumentsWithIFind",!
-    Write "  WHERE %FIND(text_content, ?) > 0",!
+    Write "iFind table ready for use",!
 
     Return $$$OK
 }

objectscript/RAG/SourceDocumentsWithIFind.CLS

@@ -30,31 +30,6 @@ Index DocIdIndex On doc_id [ Unique ];
 /// Index on creation timestamp for temporal queries
 Index CreatedAtIndex On created_at;
 
-/// Test iFind search functionality
-ClassMethod TestSearch(searchText As %String = "diabetes") As %Status
-{
-    Set tSC = $$$OK
-    Try {
-        Write "Testing iFind search for: ", searchText, !
-        
-        // Use %FIND function which works with iFind
-        &sql(SELECT COUNT(*) INTO :count 
-             FROM RAG.SourceDocumentsWithIFind 
-             WHERE %FIND(text_content, :searchText) > 0)
-        
-        If SQLCODE = 0 {
-            Write "✓ Found ", count, " documents matching '", searchText, "'", !
-        } Else {
-            Write "Search completed with SQLCODE: ", SQLCODE, !
-        }
-        
-    } Catch ex {
-        Set tSC = ex.AsStatus()
-        Write "Error during search: ", ex.DisplayString(), !
-    }
-    
-    Quit tSC
-}
 
 /// Storage definition for the class
 Storage Default

scripts/utilities/validate_ipm_module.py

@@ -166,11 +166,11 @@ def validate_objectscript_classes(self) -> None:
             print("❌ objectscript directory not found")
             return
 
-        # Check required classes
+        # Check required classes (use .CLS extension for IRIS)
         required_classes = [
-            "RAG.IPMInstaller.cls",
-            "RAG.PythonBridge.cls",
-            "RAG.VectorMigration.cls"
+            "RAG/IPMInstaller.CLS",
+            "RAG/PythonBridge.CLS", 
+            "RAG/VectorMigration.CLS"
         ]
 
         class_results = {}

scripts/validate_ipm_package.py

@@ -96,10 +96,10 @@ def validate_ipm_package(repo_path: str) -> Tuple[bool, List[str]]:
         objectscript_dir = repo_root / "objectscript"
         if objectscript_dir.exists():
             required_cls_files = [
-                "RAG.IPMInstaller.cls",
-                "RAG.VectorMigration.cls", 
-                "RAG.IFindSetup.cls",
-                "RAG.SourceDocumentsWithIFind.cls"
+                "RAG/IPMInstaller.CLS",
+                "RAG/VectorMigration.CLS", 
+                "RAG/IFindSetup.CLS",
+                "RAG/SourceDocumentsWithIFind.CLS"
             ]
 
             for cls_file in required_cls_files: