geobox 2.3.0__py3-none-any.whl → 2.4.0__py3-none-any.whl

geobox/aio/table.py

@@ -1,20 +1,36 @@
-from typing import List, Dict, Literal, Optional, TYPE_CHECKING, Union, Any
+from typing import List, Dict, Optional, TYPE_CHECKING, Union, Any
 from urllib.parse import urljoin
-
-from geobox.enums import TableExportFormat
+from dataclasses import dataclass
 
 from .base import AsyncBase
 from .task import AsyncTask
-from ..enums import FieldType
+from ..enums import FieldType, RelationshipCardinality, TableExportFormat
 from ..exception import NotFoundError
 from ..utils import clean_data
 
 if TYPE_CHECKING:
     from . import AsyncGeoboxClient
     from .user import AsyncUser
-    from .. import GeoboxClient
     from .file import AsyncFile
-    from ..table import Table, TableField, TableRow
+    from ..table import Table, TableField
+    from .vectorlayer import AsyncVectorLayer
+    from .field import AsyncField
+    from .feature import AsyncFeature
+
+
+@dataclass(frozen=True)
+class RelationshipEndpoint:
+    """
+    Represents one endpoint (source or target) of a relationship
+
+    Args:
+        table (AsyncTable | AsyncVectorLayer): The source or target table or vector layer
+        field (AsyncTableField | AsyncField | str): The field name or object on the source/target entity
+        fk_field (AsyncTableField | AsyncField | str, optional): The foreign key field name or object on the relation table. (Required for Many-to-Many relationships)
+    """
+    table: Union['AsyncTable', 'AsyncVectorLayer']
+    field: Union['AsyncTableField', 'AsyncField', str]
+    fk_field: Optional[Union['AsyncTableField', 'AsyncField', str]] = None
 
 
 class AsyncTableRow(AsyncBase):
@@ -156,30 +172,185 @@ class AsyncTableRow(AsyncBase):
         await super()._delete(self.endpoint)
 
 
-    def to_sync(self, sync_client: 'GeoboxClient') -> 'TableRow':
+    async def _get_other_side_of_relationship(
+        self, 
+        relationship: 'AsyncRelationship',
+    ) -> Union['AsyncTable', 'AsyncVectorLayer']:
+        """
+        [async] Determine which side of a relationship this table is on and return the opposite side.
+        
+        Used internally to navigate bidirectional relationships.
+        
+        Args:
+            relationship (AsyncRelationship): The relationship to examine.
+            
+        Returns:
+            AsyncTable | AsyncVectorLayer: The endpoint (table or layer) on the opposite side
+            of the relationship from this table.
+            
+        Raises:
+            ValueError: If this table is not part of the given relationship.
+            
+        Note:
+            This method assumes the table is either the source or target,
+            not the relation table in Many-to-Many relationships.
+        """
+        if relationship.source_id == self.table.id:
+            return await relationship.get_target()
+
+        if relationship.target_id == self.table.id:
+            return await relationship.get_source()
+
+        raise ValueError("Relationship does not involve this table.")
+
+
+    async def _fetch_related_from_target(
+        self, 
+        target: Union['AsyncTable', 'AsyncVectorLayer'], 
+        relationship_uuid: str,
+    ) -> Union[List['AsyncTableRow'], List['AsyncFeature']]:
+        """
+        [async] Fetch related rows/features from a relationship target.
+        
+        Internal helper that dispatches to the appropriate API method
+        based on target type.
+        
+        Args:
+            target (AsyncTable | AsyncVectorLayer): The target endpoint (Table or VectorLayer) to query.
+            relationship_uuid (str): UUID of the relationship to traverse.
+            
+        Raises:
+            TypeError: If target is not a Table or VectorLayer.
+
+        Returns:
+            List[AsyncTableRow] | List[AsyncFeature]: Related rows or features.
+        """
+        from .table import AsyncTable
+        from .vectorlayer import AsyncVectorLayer
+
+        if isinstance(target, AsyncTable):
+            return await target.get_rows(
+                relationship_uuid=relationship_uuid,
+                related_record_id=self.id,
+            )
+
+        if isinstance(target, AsyncVectorLayer):
+            return await target.get_features(
+                relationship_uuid=relationship_uuid,
+                related_record_id=self.id,
+            )
+
+        raise TypeError(f"Unsupported target type: {type(target)}")
+
+
+    async def get_related_records(self,
+        relationship_uuid: str,
+    ) -> Union[List['AsyncTableRow'], List['AsyncFeature']]:
+        """
+        [async] Get the related records on the *other side* of the relationship that are linked to this row
+
+        Args:
+            relationship_uuid (str): The uuid of relationship
+
+        Returns:
+            List[AsyncTableRow] | List[AsyncFeature]: a list of the related records
+
+        Raises:
+            ValueError:
+                If the given relationship does not involve the current table
+                (i.e., this row is neither the source nor the target of the relationship).
+
+            TypeError:
+                If the relationship target type is not supported for fetching
+                related records.
+
+        Example:
+            >>> from geobox.aio import AsyncGeoboxClient
+            >>> async with AsyncGeoboxClient() as client:
+            >>>     table = await client.get_table(uuid="12345678-1234-5678-1234-567812345678")
+            >>>     row = await table.get_row(row_id=1)
+            >>>     related_records = await row.get_related_records(relationship_uuid="12345678-1234-5678-1234-567812345678")
+        """
+        relationship = await self.api.get_relationship(relationship_uuid)
+
+        other_side = await self._get_other_side_of_relationship(relationship)
+
+        return await self._fetch_related_from_target(
+            target=other_side,
+            relationship_uuid=relationship_uuid,
+        )
+
+
+    async def associate_with(
+        self,
+        relationship_uuid: str,
+        *,
+        target_ids: Optional[List[int]] = None,
+        q: Optional[str] = None,
+    ) -> Dict:
         """
-        Switch to sync version of the table row instance to have access to the sync methods
+        [async] Create relationships between the source record and target records
 
         Args:
-            sync_client (GeoboxClient): The sync version of the GeoboxClient instance for making requests.
+            relationship_uuid (str): the relationship uuid
+            target_ids (List[int], optional): a list of target record ids to be associated with the current record
+            q (str, optional): query filter on target layer or table to select which target features or rows that are going to be related to the current record
 
         Returns:
-            TableRow: the sync instance of the TableRow.
+            Dict: the record association result
 
         Example:
-            >>> from geobox import Geoboxclient
             >>> from geobox.aio import AsyncGeoboxClient
             >>> async with AsyncGeoboxClient() as client:
             >>>     table = await client.get_table(uuid="12345678-1234-5678-1234-567812345678")
             >>>     row = await table.get_row(row_id=1)
-            >>>     sync_client = GeoboxClient()
-            >>>     sync_row = row.to_sync(sync_client)
+            >>>     await row.associate_with(
+            ...         relationship_uuid="12345678-1234-5678-1234-567812345678",
+            ...         target_ids=[1, 2, 3],
+            ...     )
+        """
+        relationship = await self.api.get_relationship(uuid=relationship_uuid)
+        return await relationship.associate_records(
+            source_id=self.id,
+            target_ids=target_ids,
+            q=q,
+        )
+
+
+    async def disassociate_with(
+        self,
+        relationship_uuid: str,
+        *,
+        target_ids: Optional[List[int]] = None,
+        q: Optional[str] = None,
+    ) -> Dict:
         """
-        from ..table import TableRow
+        [async] Remove relationships between the source record and target records
 
-        sync_table = self.table.to_sync(sync_client=sync_client)
-        return TableRow(table=sync_table, data=self.data)
+        Args:
+            relationship_uuid (str): the relationship uuid
+            target_ids (List[int], optional): a list of target record ids to be disassociated with the current record
+            q (str, optional): query filter on target layer or table to select which target features or rows that are going to be related to the current 
+            
+        Returns:
+            Dict: the record disassociation result
 
+        Example:
+            >>> from geobox.aio import AsyncGeoboxClient
+            >>> async with AsyncGeoboxClient() as client:
+            >>>     table = await client.get_table(uuid="12345678-1234-5678-1234-567812345678")
+            >>>     row = await table.get_row(row_id=1)
+            >>>     await row.disassociate_with(
+            ...         relationship_uuid="12345678-1234-5678-1234-567812345678",
+            ...         target_ids=[1, 2, 3],
+            ...     )
+        """
+        relationship = await self.api.get_relationship(uuid=relationship_uuid)
+        return await relationship.disassociate_records(
+            source_id=self.id,
+            target_ids=target_ids,
+            q=q,
+        )
 
 
 class AsyncTableField(AsyncBase):
@@ -378,30 +549,468 @@ class AsyncTableField(AsyncBase):
         return self.domain
 
 
-    def to_sync(self, sync_client: 'GeoboxClient') -> 'TableField':
+class AsyncRelationship(AsyncBase):
+    BASE_ENDPOINT = 'relationships/'
+
+    def __init__(self, 
+        api: 'AsyncGeoboxClient',
+        uuid: str,
+        data: Optional[Dict] = {},
+    ):
         """
-        Switch to sync version of the table field instance to have access to the sync methods
+        Initialize a relationship instance.
 
         Args:
-            sync_client (GeoboxClient): The sync version of the GeoboxClient instance for making requests.
+            api (AsyncGeoboxClient): The GeoboxClient instance for making requests.
+            uuid (str): The unique identifier for the relationship.
+            data (Dict): The response data of the table.
+        """
+        super().__init__(api=api, uuid=uuid, data=data)
+
+
+    def __repr__(self) -> str:
+        """
+        Return a string representation of the AsyncRelationship.
+
+        Returns:
+            str: The string representation of the AsyncRelationship.
+        """
+        return f"AsyncRelationship(uuid={self.uuid}, name={self.relation_name}, cardinality={self.relation_cardinality})"
+
+
+    @classmethod
+    async def get_relationships(
+        cls, 
+        api: 'AsyncGeoboxClient', 
+        **kwargs,
+    ) -> Union[List['AsyncRelationship'], int]:
+        """
+        [async] Get a list of relationships with optional filtering and pagination.
+
+        Args:
+            api (AsyncGeoboxClient): The GeoboxClient instance for making requests.
+
+        Keyword Args:
+            q (str): query filter based on OGC CQL standard. e.g. "field1 LIKE '%GIS%' AND created_at > '2021-01-01'"
+            search (str): search term for keyword-based searching among search_fields or all textual fields if search_fields does not have value. NOTE: if q param is defined this param will be ignored
+            search_fields (str): comma separated list of fields for searching
+            order_by (str): comma separated list of fields for sorting results [field1 A|D, field2 A|D, …]. e.g. name A, type D. NOTE: "A" denotes ascending order and "D" denotes descending order.
+            return_count (bool): Whether to return total count. default: False.
+            skip (int): Number of items to skip. default: 0
+            limit (int): Number of items to return. default: 10
+            user_id (int): Specific user. privileges required
+            shared (bool): Whether to return shared tables. default: False
 
         Returns:
-            TableField: the sync instance of the TableField.
+            List[AsyncRelationship] | int: A list of relationship instances or the total number of relationships.
 
         Example:
-            >>> from geobox import Geoboxclient
             >>> from geobox.aio import AsyncGeoboxClient
+            >>> from geobox.aio.table import AsyncRelatinship
             >>> async with AsyncGeoboxClient() as client:
-            >>>     table = await client.get_table(uuid="12345678-1234-5678-1234-567812345678")
-            >>>     field = await table.get_field(field_id=1)
-            >>>     sync_client = GeoboxClient()
-            >>>     sync_field = field.to_sync(sync_client)
+            >>>     relationships = await client.get_relationships(q="name LIKE '%My relationship%'")
+            or
+            >>>     relationships = await Table.get_relationships(client, q="name LIKE '%My relationship%'")
         """
-        from ..table import TableField
+        params = {
+           'f': 'json',
+           'q': kwargs.get('q'),
+           'search': kwargs.get('search'),
+           'search_fields': kwargs.get('search_fields'),
+           'order_by': kwargs.get('order_by'),
+           'return_count': kwargs.get('return_count', False),
+           'skip': kwargs.get('skip', 0),
+           'limit': kwargs.get('limit', 10),
+           'user_id': kwargs.get('user_id'),
+           'shared': kwargs.get('shared', False),
+        }
+        return await super()._get_list(api, cls.BASE_ENDPOINT, params, factory_func=lambda api, item: AsyncRelationship(api, item['uuid'], item))
+
+
+    @classmethod
+    async def create_relationship(
+        cls,
+        api: 'AsyncGeoboxClient',
+        name: str,
+        cardinality: RelationshipCardinality,
+        *,
+        source: 'RelationshipEndpoint',
+        target: 'RelationshipEndpoint',
+        relation_table: Optional['AsyncTable'] = None,
+        display_name: Optional[str] = None,
+        description: Optional[str] = None,
+        user_id: Optional[int] = None,
+    ) -> 'AsyncRelationship':
+        """
+        [async] Create a new AsyncRelationship
 
-        sync_table = self.table.to_sync(sync_client=sync_client)
-        return TableField(table=sync_table, data_type=self.data_type, field_id=self.field_id, data=self.data)
+        Args:
+            api (AsyncGeoboxClient): The GeoboxClient instance for making requests.
+            name (str): name of the relationship
+            cardinality (RelationshipCardinality): One to One, One to Many, or Many to Many
+            
+        Keyword Args:
+            source (RelationshipEndpoint): Definition of the source side of the relationship, including the table (or layer), field, and foreign-key field
+            target (RelationshipEndpoint): Definition of the target side of the relationship, including the table (or layer), field, and foreign-key field
+            relation_table (AsyncTable, optional): The table that stores the relationship metadata or join records. (Required for Many-to-Many relationships)
+            display_name (str, optional): Human-readable name for the relationship
+            description (str, optional): the description of the relationship
+            user_id (int, optional): Specific user. privileges required.
 
+        Returns:
+            AsyncRelationship: a relationship instance
+
+        Example:
+            >>> from geobox.aio import AsyncGeoboxClient
+            >>> from geobox.aio.table import AsyncRelationship, RelationshipEndpoint, RelationshipCardinality
+            >>> async with AsyncGeoboxClient() as client:
+            >>>     source = RelationshipEndpoint(
+            ...         table=client.get_table_by_name('owner'),
+            ...         field="name", # on source table
+            ...         fk_field="book_name", # on relation table
+            ...     )
+            >>>     target = RelationshipEndpoint(
+            ...         table=client.get_table_by_name('parcel'),
+            ...         field="name", # on target table
+            ...         fk_field="author_name", # on relation table
+            ...     )
+            >>>     relationship = await client.create_relationship(
+            ...         name="book_author",
+            ...         cardinality=RelationshipCardinality.ManytoMany,
+            ...         source=source,
+            ...         target=target,
+            ...         relation_table=client.get_table_by_name('owner_parcel'),
+            ...     )
+            or
+            >>>     relationship = await AsyncRelationship.create_relationship(
+            ...         client,
+            ...         name="owner_parcel",
+            ...         cardinality=RelationshipCardinality.ManytoMany,
+            ...         source=source,
+            ...         target=target,
+            ...         relation_table=client.get_table_by_name('owner_parcel'),
+            ...     )
+        """
+        data = {
+            "relation_name": name,
+            "display_name": display_name,
+            "description": description,
+            "relation_cardinality": cardinality.value,
+            "relation_table_id": relation_table.id if relation_table else None,
+            "relation_table_search": f"{relation_table.__class__.__name__.split('Async')[-1]}/{relation_table.name}" if relation_table else None,
+            "source_field_name": source.field if type(source.field) == str else source.field.name,
+            "source_fk_name": (source.fk_field if not source.fk_field or type(source.fk_field) == str else source.fk_field.name) if relation_table else None,
+            "source_id": source.table.id,
+            "source_search": f"{source.table.__class__.__name__.split('Async')[-1]}/{source.table.name}",
+            "source_type": str(source.table.__class__.__name__.split('Async')[-1]),
+            "target_field_name": target.field if type(target.field) == str else target.field.name,
+            "target_fk_name": (target.fk_field if not target.fk_field or type(target.fk_field) == str else target.fk_field.name) if relation_table else None,
+            "target_id": target.table.id,
+            "target_search": f"{target.table.__class__.__name__.split('Async')[-1]}/{target.table.name}",
+            "target_type": str(target.table.__class__.__name__.split('Async')[-1]),
+            "user_id": user_id,
+        }
+        return await super()._create(api, cls.BASE_ENDPOINT, data, factory_func=lambda api, item: AsyncRelationship(api, item['uuid'], item))
+
+
+    @classmethod
+    async def get_relationship(
+        cls, 
+        api: 'AsyncGeoboxClient', 
+        uuid: str, 
+        user_id: Optional[int] = None,
+    ) -> 'AsyncRelationship':
+        """
+        [async] Get a relationship by UUID.
+
+        Args:
+            api (AsyncGeoboxClient): The AsyncGeoboxClient instance for making requests.
+            uuid (str): The UUID of the relationship to get.
+            user_id (int, optional): Specific user. privileges required.
+
+        Returns:
+            AsyncRelationship: The AsyncRelationship object.
+
+        Raises:
+            NotFoundError: If the AsyncRelationship with the specified UUID is not found.
+
+        Example:
+            >>> from geobox.aio import AsyncGeoboxClient
+            >>> from geobox.aio.table import AsyncRelationship
+            >>> async with AsyncGeoboxClient() as client:
+            >>>     relationship = await client.get_relationship(uuid="12345678-1234-5678-1234-567812345678")
+            or  
+            >>>     relationship = await AsyncRelationship.get_relationship(client, uuid="12345678-1234-5678-1234-567812345678")
+        """
+        params = {
+            'f': 'json',
+            'user_id': user_id,
+        }
+        return await super()._get_detail(api, cls.BASE_ENDPOINT, uuid, params, factory_func=lambda api, item: AsyncRelationship(api, item['uuid'], item))
+
+
+    @classmethod
+    async def get_relationship_by_name(
+        cls, 
+        api: 'AsyncGeoboxClient', 
+        name: str, 
+        user_id: Optional[int] = None,
+    ) -> Union['AsyncRelationship', None]:
+        """
+        [async] Get a relationship by name
+
+        Args:
+            api (AsyncGeoboxClient): The GeoboxClient instance for making requests.
+            name (str): the name of the relationship to get
+            user_id (int, optional): specific user. privileges required.
+
+        Returns:
+            AsyncRelationship | None: returns the relationship if a relationship matches the given name, else None
+
+        Example:
+            >>> from geobox.aio import AsyncGeoboxClient
+            >>> from geobox.aio.table import AsyncRelationship
+            >>> async with AsyncGeoboxClient() as client:
+            >>>     relationship = await client.get_relationship_by_name(name='test')
+            or
+            >>>     relationship = await AsyncRelationship.get_relationship_by_name(client, name='test')
+        """
+        relationships = await cls.get_relationships(api, q=f"name = '{name}'", user_id=user_id)
+        if relationships and relationships[0].relation_name == name:
+            return relationships[0]
+        else:
+            return None
+
+
+    async def update(self, **kwargs) -> Dict:
+        """
+        [async] Update the relationship.
+
+        Keyword Args:
+            name (str): The name of the relationship.
+            display_name (str): The display name of the relationship.
+            description (str): The description of the relationship.
+
+        Returns:
+            Dict: The updated relationship data.
+
+        Raises:
+            ValidationError: If the relationship data is invalid.
+
+        Example:
+            >>> from geobox.aio import AsyncGeoboxClient
+            >>> from geobox.aio.table import AsyncRelationship
+            >>> async with AsyncGeoboxClient() as client:
+            >>>     relationship = await AsyncRelationship.get_relationship(client, uuid="12345678-1234-5678-1234-567812345678")
+            >>>     await relationship.update(display_name="New Display Name")
+        """
+        data = {
+            "name": kwargs.get('name'),
+            "display_name": kwargs.get('display_name'),   
+            "description": kwargs.get('description'),
+        }
+        return await super()._update(self.endpoint, data)
+
+
+    async def delete(self) -> None:
+        """
+        [async] Delete the AsyncRelationship
+
+        Returns:
+            None
+
+        Example:
+            >>> from geobox.aio import AsyncGeoboxClient
+            >>> from geobox.aio.table import AsyncRelationship
+            >>> async with AsyncGeoboxClient() as client:
+            >>>     relationship = await AsyncRelationship.get_relationship(client, uuid="12345678-1234-5678-1234-567812345678")
+            >>>     await relationship.delete()
+        """
+        await super()._delete(self.endpoint)
+
+
+    async def get_source(self) -> Union['AsyncTable', 'AsyncVectorLayer']:
+        """
+        [async] Get the source table or layer
+
+        Returns:
+            AsyncTable | AsyncVectorLayer: the source table or layer
+
+        Raises:
+            NotFoundError: if the table or layer has been deleted
+
+        Example:
+            >>> from geobox.aio import AsyncGeoboxClient
+            >>> async with AsyncGeoboxClient() as client:
+            >>>     relationship = await client.get_relationship(uuid="12345678-1234-5678-1234-567812345678")
+            >>>     source_table = await relationship.get_source()
+        """
+        try:
+            result = []
+            if self.source_type == 'Table':
+                result = await self.api.get_tables(
+                    q=f"id = {self.source_id}"
+                )
+            elif self.source_type == 'VectorLayer':
+                result = await self.api.get_vectors(
+                    q=f"id = {self.source_id}"
+                )
+            source = next(source for source in result if source.id == self.source_id)
+            return source
+            
+        except StopIteration:
+            raise NotFoundError("Table not found!")
+
+
+    async def get_target(self) -> Union['AsyncTable', 'AsyncVectorLayer']:
+        """
+        [async] Get the target table or layer
+
+        Returns:
+            AsyncTable: the target table or layer
+
+        Raises:
+            NotFoundError: if the table or layer has been deleted
+
+        Example:
+            >>> from geobox.aio import AsyncGeoboxClient
+            >>> async with AsyncGeoboxClient() as client:
+            >>>     relationship = await client.get_relationship(uuid="12345678-1234-5678-1234-567812345678")
+            >>>     target_table = await relationship.get_target()
+        """
+        try:
+            result = []
+            if self.target_type == 'Table':
+                result = await self.api.get_tables(
+                    q=f"id = {self.target_id}"
+                )
+            elif self.target_type == 'VectorLayer':
+                result = await self.api.get_vectors(
+                    q=f"id = {self.target_id}"
+                )
+            target = next(target for target in result if target.id == self.target_id)
+            return target
+            
+        except StopIteration:
+            raise NotFoundError("Table not found!")
+
+
+    async def get_relation_table(self) -> 'AsyncTable':
+        """
+        [async] Get the relation table
+
+        Returns:
+            AsyncTable: the relation table
+
+        Raises:
+            ValueError: If the relationship is not Many-to-Many and thus has no relation table
+            NotFoundError: if the table has been deleted
+
+        Example:
+            >>> from geobox.aio import AsyncGeoboxClient
+            >>> async with AsyncGeoboxClient() as client:
+            >>>     relationship = await client.get_relationship(uuid="12345678-1234-5678-1234-567812345678")
+            >>>     relation_table = await relationship.get_relation_table()
+        """
+        try:
+            if not self.relation_table_id:
+                raise ValueError(
+                    "Relationship is not Many-to-Many. "
+                    "Relation tables are only used for Many-to-Many cardinality."
+                )
+
+            result = await self.api.get_tables(
+                q=f"id = {self.relation_table_id}"
+            )
+            table = next(table for table in result if table.id == self.relation_table_id)
+            return table
+            
+        except StopIteration:
+            raise NotFoundError("Table not found!")
+
+
+    async def associate_records(
+        self,
+        source_id: int,
+        *,
+        target_ids: Optional[List[int]] = None,
+        q: Optional[str] = None,
+    ) -> Dict:
+        """
+        [async] Create relationships between the source record and target records
+
+        Args:
+            source_id (int): the id of feature/row in the source layer/table
+            target_ids (List[int], optional): a list of target record ids to be associated with the current record
+            q (str, optional): query filter on target layer or table to select which target features or rows that are going to be related to the current record
+        
+        Returns:
+            Dict: the record association result
+
+        Example:
+            >>> from geobox.aio import AsyncGeoboxClient
+            >>> async with AsyncGeoboxClient() as client:
+            >>>     relationship = await client.get_relationship(uuid="12345678-1234-5678-1234-567812345678")
+            >>>     result = await relationship.associate_records(
+            ...         source_id=1,
+            ...         target_ids=[1, 2, 3],
+            ...         q="name LIKE '%_school'",
+            ...     )
+        """
+        data = {
+            'source_id': source_id,
+            'target_ids': ', '.join([str(i) for i in target_ids]),
+            'q': q,
+        }
+
+        endpoint = f"{self.endpoint}associateRecords/"
+        return await self.api.post(
+            endpoint,
+            clean_data(data),
+            is_json=False,
+        )
+
+
+    async def disassociate_records(
+        self,
+        source_id: int,
+        *,
+        target_ids: Optional[List[int]] = None,
+        q: Optional[str] = None,
+    ) -> Dict:
+        """
+        [async] Remove relationships between the source record and target records
+
+        Args:
+            source_id (int): the id of feature/row in the source layer/table
+            target_ids (List[int], optional): a list of target record ids to be disassociated with the current record
+            q (str, optional): query filter on target layer or table to select which target features or rows that are going to be related to the current record
+        
+        Returns:
+            Dict: the record disassociation result
+
+        Example:
+            >>> from geobox.aio import AsyncGeoboxClient
+            >>> async with AsyncGeoboxClient() as client:
+            >>>     relationship = await client.get_relationship(uuid="12345678-1234-5678-1234-567812345678")
+            >>>     result = await relationship.disassociate_records(
+            ...         source_id=1,
+            ...         target_ids=[1, 2, 3],
+            ...         q="name LIKE '%_school'",
+            ...     )
+        """
+        data = {
+            'source_id': source_id,
+            'target_ids': ', '.join([str(i) for i in target_ids]),
+            'q': q,
+        }
+
+        endpoint = f"{self.endpoint}disassociateRecords/"
+        return await self.api.post(
+            endpoint,
+            clean_data(data),
+            is_json=False,
+        )
 
 
 class AsyncTable(AsyncBase):
@@ -426,7 +1035,7 @@ class AsyncTable(AsyncBase):
     @classmethod
     async def get_tables(cls, api: 'AsyncGeoboxClient', **kwargs) -> Union[List['AsyncTable'], int]:
         """
-        [async] Get list of tables with optional filtering and pagination.
+        [async] Get a list of tables with optional filtering and pagination.
 
         Args:
             api (AsyncGeoboxClient): The AsyncGeoboxClient instance for making requests.
@@ -595,7 +1204,7 @@ class AsyncTable(AsyncBase):
             >>> from geobox.aio.table import AsyncTable
             >>> async with AsyncGeoboxClient() as client:
             >>>     table = await AsyncTable.get_table(client, uuid="12345678-1234-5678-1234-567812345678")
-            >>>     await table.update_table(display_name="New Display Name")
+            >>>     await table.update(display_name="New Display Name")
         """
         data = {
             "name": kwargs.get('name'),
@@ -745,7 +1354,7 @@ class AsyncTable(AsyncBase):
             data (Dict, optional): Additional field properties (display_name, description, etc.).
             
         Returns:
-            Field: The newly created field instance.
+            AsyncTableField: The newly created field instance.
             
         Raises:
             ValidationError: If the field data is invalid.
@@ -822,6 +1431,8 @@ class AsyncTable(AsyncBase):
         [async] Query rows of a table
 
         Keyword Args:
+            relationship_uuid (str): The uuid of relationship
+            related_record_id (int): This is the id of the feature/row that these rows are related to. This id belongs to the related layer/table not this table
             q (str): Advanced filtering expression, e.g., 'status = "active" and age > 20'
             search (str): Search term for keyword-based searching among fields/columns
             search_fields (str): Comma separated column names to search in
@@ -849,6 +1460,8 @@ class AsyncTable(AsyncBase):
         """
         params = {
             'f': 'json',
+            'relationship_uuid': kwargs.get('relationship_uuid'),
+            'related_record_id': kwargs.get('related_record_id'),
             'q': kwargs.get('q'),
             'search': kwargs.get('search'),
             'search_fields': kwargs.get('search_fields'),
@@ -1118,27 +1731,3 @@ class AsyncTable(AsyncBase):
             'limit': limit
         }
         return await super()._get_shared_users(self.endpoint, params)
-
-
-    def to_sync(self, sync_client: 'GeoboxClient') -> 'Table':
-        """
-        Switch to sync version of the table instance to have access to the sync methods
-
-        Args:
-            sync_client (GeoboxClient): The sync version of the GeoboxClient instance for making requests.
-
-        Returns:
-            Table: the sync instance of the table.
-
-        Example:
-            >>> from geobox import Geoboxclient
-            >>> from geobox.aio import AsyncGeoboxClient
-            >>> from geobox.aio.table import AsyncTable
-            >>> async with AsyncGeoboxClient() as client:
-            >>>     table = await AsyncTable.get_table(client, uuid="12345678-1234-5678-1234-567812345678")
-            >>>     sync_client = GeoboxClient()
-            >>>     sync_table = table.to_async(sync_client)
-        """
-        from ..table import Table
-
-        return Table(api=sync_client, uuid=self.uuid, data=self.data)