surfdataverse 4.0.0__tar.gz → 4.0.2__tar.gz

{surfdataverse-4.0.0 → surfdataverse-4.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: surfdataverse
-Version: 4.0.0
+Version: 4.0.2
 Summary: A Python package for ionysis Microsoft Dataverse integration
 Keywords: dataverse,microsoft,crm,api
 Author: ionysis
@@ -76,8 +76,8 @@ client.get_authenticated_session()
 client.test_connection()
 
 # Create entities/tables using modern DI factory functions
-product = connect_entity("logical_table_name_1", "prefix_")
-table_reader = connect_table("logical_table_name_1", "prefix_")
+product = connect_entity("logical_table_name_1")
+table_reader = connect_table("logical_table_name_1")
 
 # Set data using write() method with automatic type detection
 product.write("prefix_name", "My Product")
@@ -167,7 +167,7 @@ default_entity = connect_entity("prefix_tablename", "prefix_")
 custom_entity = connect_entity("myorg_product", "myorg_")
 
 # For reading data
-table_reader = connect_table("prefix_tablename", "prefix_")
+table_reader = connect_table("prefix_tablename")
 
 # The system automatically:
 # - Filters columns starting with your prefix
@@ -183,7 +183,7 @@ Fetch data from Dataverse tables as pandas DataFrames using modern DI patterns:
 from surfdataverse import connect_table, get_client
 
 # Create table reader using dependency injection
-table_reader = connect_table("logical_table_name_1", "prefix_")
+table_reader = connect_table("logical_table_name_1")
 
 # Get table data as pandas DataFrame
 df = table_reader.get_table_data()

{surfdataverse-4.0.0 → surfdataverse-4.0.2}/README.md

@@ -47,8 +47,8 @@ client.get_authenticated_session()
 client.test_connection()
 
 # Create entities/tables using modern DI factory functions
-product = connect_entity("logical_table_name_1", "prefix_")
-table_reader = connect_table("logical_table_name_1", "prefix_")
+product = connect_entity("logical_table_name_1")
+table_reader = connect_table("logical_table_name_1")
 
 # Set data using write() method with automatic type detection
 product.write("prefix_name", "My Product")
@@ -138,7 +138,7 @@ default_entity = connect_entity("prefix_tablename", "prefix_")
 custom_entity = connect_entity("myorg_product", "myorg_")
 
 # For reading data
-table_reader = connect_table("prefix_tablename", "prefix_")
+table_reader = connect_table("prefix_tablename")
 
 # The system automatically:
 # - Filters columns starting with your prefix
@@ -154,7 +154,7 @@ Fetch data from Dataverse tables as pandas DataFrames using modern DI patterns:
 from surfdataverse import connect_table, get_client
 
 # Create table reader using dependency injection
-table_reader = connect_table("logical_table_name_1", "prefix_")
+table_reader = connect_table("logical_table_name_1")
 
 # Get table data as pandas DataFrame
 df = table_reader.get_table_data()

{surfdataverse-4.0.0 → surfdataverse-4.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "surfdataverse"
-version = "4.0.0"
+version = "4.0.2"
 description = "A Python package for ionysis Microsoft Dataverse integration"
 readme = "README.md"
 authors = [

{surfdataverse-4.0.0 → surfdataverse-4.0.2}/src/surfdataverse/container.py

@@ -34,14 +34,14 @@ def get_client(config_path=None) -> DataverseClient:
     return container.client()
 
 
-def connect_table(logical_name: str = "", prefix: str = "") -> DataverseTable:
+def connect_table(logical_name: str = "") -> DataverseTable:
     """Connect to a Dataverse table"""
-    return container.table_factory(logical_name, prefix)
+    return container.table_factory(logical_name)
 
 
-def connect_entity(table_logical_name: str, table_prefix: str = "") -> DataverseEntity:
+def connect_entity(table_logical_name: str) -> DataverseEntity:
     """Connect to a new Dataverse entity instance"""
-    return container.entity_factory(table_logical_name, table_prefix)
+    return container.entity_factory(table_logical_name)
 
 
 def reset_container():

{surfdataverse-4.0.0 → surfdataverse-4.0.2}/src/surfdataverse/core.py

@@ -7,7 +7,7 @@ from decimal import Decimal
 from pathlib import Path
 from typing import Optional
 
-import msal
+import msal  # type: ignore
 import pandas as pd
 import requests
 
@@ -194,7 +194,7 @@ class DataverseClient:
 class DataverseBase:
     """Base class for Dataverse operations with shared functionality"""
 
-    def __init__(self, table_logical_name: str = "", prefix="", client=None):
+    def __init__(self, table_logical_name: str = "", client=None):
         if client is None:
             raise ValueError(
                 "Client is required. Use connect_entity() or connect_table() instead of direct instantiation."
@@ -202,20 +202,16 @@ class DataverseBase:
         self.client = client
 
         self.table_logical_name = table_logical_name
-        self.table_logical_name_prefix = prefix
-        self.name = (
-            table_logical_name.replace(self.table_logical_name_prefix, "").title().replace("_", " ")
-        )
+        self.name = table_logical_name.title().replace("_", " ")
 
         # Stored values for this session
-        self._guid_mapping = {}
-        self._all_relationships = {}  # Populated by first call
-        self._global_choices = {}  # Populated by first call
+        self._guid_mapping: dict[str, dict] = {}
+        self._all_relationships: dict = {}  # Populated by first call
+        self._global_choices: dict = {}  # Populated by first call
 
-        self._table_metadata = {}
-        self._table_definitions = {}
-        self._table_relationships = {}
-        self._filtered_choices = {}
+        self._table_metadata: dict = {}
+        self._table_definitions: dict = {}
+        self._table_relationships: dict = {}
 
     # === RELATIONSHIPS
     @property
@@ -278,17 +274,6 @@ class DataverseBase:
 
         return self._global_choices
 
-    @property
-    def filtered_choices(self):
-        """Get choices filtered by table prefix"""
-        if not self._filtered_choices:
-            self._filtered_choices = {
-                name: options
-                for name, options in self.global_choices.items()
-                if self.table_logical_name_prefix in name
-            }
-        return self._filtered_choices
-
     # === TABLES
     def get_table_definitions(self):
         if not self._table_definitions:
@@ -376,7 +361,7 @@ class DataverseBase:
             raise DataverseAPIError(error_msg, response.status_code, response.text)
 
     # === HELPER METHODS
-    def name_to_guid(self, table_name, name=None, name_column=None) -> uuid.UUID | None:
+    def name_to_guid(self, table_name, name: str="", name_column=None) -> str | None:
         """
         Fetches a mapping of unique names to GUIDs in a Dataverse table
 
@@ -683,14 +668,13 @@ class DataverseTable(DataverseBase):
 class DataverseEntity(DataverseBase):
     """Generic class for Dataverse entities"""
 
-    def __init__(self, table_logical_name, table_prefix="", client=None):
+    def __init__(self, table_logical_name, client=None):
         """
         Args:
             table_logical_name: The pluralized name of the Dataverse table
-            table_prefix: The prefix used for custom table/column names (default: "prefix_")
             client: Optional DataverseClient instance (will create singleton if not provided)
         """
-        super().__init__(table_logical_name, table_prefix, client)
+        super().__init__(table_logical_name, client)
 
         self.guid = None
         self.data = {}  # Dictionary to store record fields
@@ -716,14 +700,25 @@ class DataverseEntity(DataverseBase):
             field_type = metadata[column].get("AttributeType")
 
             # File columns (check first since they can have special handling)
-            if field_type == "File" or (field_type == "Virtual" and "json" in column.lower()):
+            if field_type in ["File", "Image", "Virtual"]:
                 self.set_file(column, value)
-            # Lookup columns
-            elif column in self.get_table_relationships():
+
+            elif field_type == "Lookup":
+                if column not in self.get_table_relationships():
+                    raise EntityError(
+                        f"Crosscheck: Column {column} is not a valid lookup for this entity despite "
+                        f"being lookup"
+                    )
                 self.set_lookup(column, value)
-            # Choice columns (picklist/option sets)
-            elif column in self.filtered_choices:
+
+            elif field_type == "Picklist":
+                if column not in self.global_choices:
+                    raise EntityError(
+                        f"Crosscheck: Column {column} is not a valid choice for this entity despite "
+                        f"being picklist"
+                    )
                 self.set_choice(column, value)
+
             # Regular data columns (including DateTime, String, Integer, Decimal, etc.)
             else:
                 self.set_data(column, value)
@@ -762,7 +757,7 @@ class DataverseEntity(DataverseBase):
             elif column in self.get_table_relationships():
                 return self.get_lookup(column)
             # Choice columns (picklist/option sets)
-            elif column in self.filtered_choices:
+            elif column in self.global_choices:
                 return self.get_choice(column)
             # Regular data columns (including DateTime, String, Integer, Decimal, etc.)
             else:
@@ -793,8 +788,7 @@ class DataverseEntity(DataverseBase):
 
             # Update our data with the fresh record
             for field, fresh_value in record.items():
-                if field.startswith(self.table_logical_name_prefix) or field.endswith("id"):
-                    self.data[field] = fresh_value
+                self.data[field] = fresh_value
 
             logger.info(f"Refreshed data for {self.table_logical_name} GUID: {self.guid}")
             return True
@@ -837,8 +831,7 @@ class DataverseEntity(DataverseBase):
 
                 # Update our data with the fresh record
                 for field, fresh_value in record.items():
-                    if field.startswith(self.table_logical_name_prefix) or field.endswith("id"):
-                        self.data[field] = fresh_value
+                    self.data[field] = fresh_value
 
                 # Return the requested value
                 value = self.data.get(column, "")
@@ -859,7 +852,10 @@ class DataverseEntity(DataverseBase):
         target_entity_set_name = self.get_table_entity_set_name(logical_name=target_entity)
 
         if not is_valid_guid(value):
-            value = self.name_to_guid(target_entity, value)
+            guid_result = self.name_to_guid(target_entity, value)
+            if guid_result is None:
+                raise EntityError(f"Could not find GUID for lookup value '{value}'")
+            value = guid_result
 
         self.data[f"{lookup_column_schema_name}@odata.bind"] = f"/{target_entity_set_name}({value})"
 
@@ -875,7 +871,7 @@ class DataverseEntity(DataverseBase):
     # === CHOICE
     def set_choice(self, column, value):
         """Adds a choice field by looking up its numeric value"""
-        choice_value = self.filtered_choices[column].get(value)  # Get numeric value for choice
+        choice_value = self.global_choices[column].get(value)  # Get numeric value for choice
         if choice_value is not None:
             self.data[column] = choice_value
         else:
@@ -885,7 +881,7 @@ class DataverseEntity(DataverseBase):
 
     def get_choice(self, column):
         """Retrieves the readable choice name from its stored numeric value (Int → String)"""
-        choice_dict = self.filtered_choices.get(column, {})
+        choice_dict = self.global_choices.get(column, {})
         choices_invert = {v: k for k, v in choice_dict.items()}  # Invert dict for reverse lookup
         numeric_value = self.data.get(column, None)
         return choices_invert.get(numeric_value, None)
@@ -956,9 +952,14 @@ class DataverseEntity(DataverseBase):
             filename = f"{column}_data.json"
             # logger.info(f"Uploading JSON content as file: {filename} of type {type(json_content)}")
             return self.upload_file(column, file_content, filename)
+        elif isinstance(value, bytes):
+            # Raw bytes data - upload directly
+            file_content = io.BytesIO(value)
+            filename = f"{column}_data.bin"  # Generic binary file extension
+            return self.upload_file(column, file_content, filename)
         else:
             raise ValueError(
-                f"Unsupported file value type: {type(value)}. Expected dict or list for JSON data."
+                f"Unsupported file value type: {type(value)}. Expected dict, list, or bytes for file data."
             )
 
     def get_file_url(self, column):