Refactor extensions architecture: replace TableIngestClient with specialized clients

robosystems_client/extensions/__init__.py

@@ -28,12 +28,22 @@
   OperationProgress,
   OperationResult,
 )
-from .table_ingest_client import (
-  TableIngestClient,
-  UploadOptions,
-  IngestOptions,
-  UploadResult,
+from .file_client import (
+  FileClient,
+  FileUploadOptions,
+  FileUploadResult,
+  FileInfo,
+)
+from .materialization_client import (
+  MaterializationClient,
+  MaterializationOptions,
+  MaterializationResult,
+  MaterializationStatus,
+)
+from .table_client import (
+  TableClient,
   TableInfo,
+  QueryResult as TableQueryResult,
 )
 from .graph_client import (
   GraphClient,
@@ -177,12 +187,20 @@
   "OperationStatus",
   "OperationProgress",
   "OperationResult",
-  # Table Ingest Client
-  "TableIngestClient",
-  "UploadOptions",
-  "IngestOptions",
-  "UploadResult",
+  # File Client
+  "FileClient",
+  "FileUploadOptions",
+  "FileUploadResult",
+  "FileInfo",
+  # Materialization Client
+  "MaterializationClient",
+  "MaterializationOptions",
+  "MaterializationResult",
+  "MaterializationStatus",
+  # Table Client
+  "TableClient",
   "TableInfo",
+  "TableQueryResult",
   # Graph Client
   "GraphClient",
   "GraphMetadata",

robosystems_client/extensions/extensions.py

@@ -9,7 +9,9 @@
 from .query_client import QueryClient
 from .agent_client import AgentClient
 from .operation_client import OperationClient
-from .table_ingest_client import TableIngestClient
+from .file_client import FileClient
+from .materialization_client import MaterializationClient
+from .table_client import TableClient
 from .graph_client import GraphClient
 from .sse_client import SSEClient
 
@@ -61,7 +63,9 @@ def __init__(self, config: RoboSystemsExtensionConfig = None):
     self.query = QueryClient(self.config)
     self.agent = AgentClient(self.config)
     self.operations = OperationClient(self.config)
-    self.tables = TableIngestClient(self.config)
+    self.files = FileClient(self.config)
+    self.materialization = MaterializationClient(self.config)
+    self.tables = TableClient(self.config)
     self.graphs = GraphClient(self.config)
 
   def monitor_operation(
@@ -92,7 +96,12 @@ def close(self):
     self.query.close()
     self.agent.close()
     self.operations.close_all()
-    self.tables.close()
+    if hasattr(self.files, "close"):
+      self.files.close()
+    if hasattr(self.materialization, "close"):
+      self.materialization.close()
+    if hasattr(self.tables, "close"):
+      self.tables.close()
     self.graphs.close()
 
   # Convenience methods that delegate to the appropriate clients