adss 1.21__py3-none-any.whl → 1.23__py3-none-any.whl

adss/__init__.py

@@ -16,9 +16,14 @@ from adss.models.user import User, Role
 from adss.models.query import Query, QueryResult
 from adss.models.metadata import Schema, Table, Column
 
+from adss.utils import (
+    handle_response_errors, parse_datetime, parquet_to_dataframe
+)
+
 __all__ = [
     'ADSSClient',
     'ADSSClientError', 'AuthenticationError', 'PermissionDeniedError',
     'ResourceNotFoundError', 'QueryExecutionError',
-    'User', 'Role', 'Query', 'QueryResult', 'Schema', 'Table', 'Column'
+    'User', 'Role', 'Query', 'QueryResult', 'Schema', 'Table', 'Column',
+    'handle_response_errors', 'parse_datetime', 'parquet_to_dataframe'
 ]

adss/utils.py

@@ -13,7 +13,6 @@ from adss.exceptions import (
     ResourceNotFoundError, QueryExecutionError, ServerError
 )
 
-
 def handle_response_errors(response):
     """Handles HTTP response errors and raises appropriate exceptions."""
     if 200 <= response.status_code < 300:

{adss-1.21.dist-info → adss-1.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adss
-Version: 1.21
+Version: 1.23
 Summary: Astronomical Data Smart System
 Home-page: https://github.com/schwarzam/adss
 Author: Gustavo Schwarz

adss-1.23.dist-info/RECORD

@@ -0,0 +1,20 @@
+adss/__init__.py,sha256=3FpHFL3Pk5BvETwd70P2QqYvDq799Cu2AGxGxudGAAE,1020
+adss/auth.py,sha256=M8GAN8pdfmJfsEOqv_EW2ru0uP0H1JtK7IfBDrIZMyg,4025
+adss/client.py,sha256=Ojc6jqZtCBMwRoTGuBiF0SEDkdWs_-xbGwyk03nHkr8,29613
+adss/exceptions.py,sha256=YeN-xRHvlSmwyS8ni2jOEhhgZK9J1jsG11pOedy3Gfg,1482
+adss/utils.py,sha256=KeQUtTCcye3W07oHpBnwS7g3gG-RqwWMlaE7UgDWwsU,3557
+adss/endpoints/__init__.py,sha256=Pr29901fT8ClCS2GasTjTiBNyn7DfVfxILpYDFsMvPA,488
+adss/endpoints/admin.py,sha256=S6ZrkeA_Lh_LCpF1NHyfMKqjbIiylYXUSV65H_WKg1U,16391
+adss/endpoints/images.py,sha256=ItAiBss_jQvWQWRUvy0c9Cjn1r9lDR8eOPauqOcPcZ8,35777
+adss/endpoints/metadata.py,sha256=RPrRP6Uz6-uPMIcntMgfss9vAd5iN7JXjZbF8SW0EYg,8238
+adss/endpoints/queries.py,sha256=5BONw_IcGORMPNe-5J6BpoFY6z7lKcktEVhqZ9j17_8,17286
+adss/endpoints/users.py,sha256=6Abkl3c3_YKdMYR_JWI-uL9HTHxcjlIOnE29GyN5_QE,10811
+adss/models/__init__.py,sha256=ADWVaGy4dkpEMH3iS_6EnRSBlEgoM5Vy9zORQr-UG6w,404
+adss/models/metadata.py,sha256=6fdH_0BenVRmeXkkKbsG2B68O-N2FXTTRgxsEhAHRoU,4058
+adss/models/query.py,sha256=Af-iojZb-nO6qj-yMT_PlNM7Hip6EwBfNeaQPMJPNM0,4293
+adss/models/user.py,sha256=5qVT5qOktokmVLkGszPGCTZWv0wC-7aBMvJ8EeBOqdw,3493
+adss-1.23.dist-info/LICENSE,sha256=1aYqcyqjrdNXY9hqgZkCWprcoA112oKvdrfPyvMYPTc,1468
+adss-1.23.dist-info/METADATA,sha256=jkFEx5_HoE0kyop0UCpMGZTJDYnBjsLgAzSz9e8MBG8,379
+adss-1.23.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+adss-1.23.dist-info/top_level.txt,sha256=ebD44L3R0PEvEFoRCJ-RjTIsQ9Yjpo2aAYC1BMtueLg,5
+adss-1.23.dist-info/RECORD,,

adss/adss_manager.py

@@ -1,53 +0,0 @@
-import requests
-import pprint
-import os
-
-import xml.etree.ElementTree as ET
-
-from adss.table import Table
-from adss.variables import BASEURL
-
-class ADSSManager:
-    def __init__(self):
-        self.tables = {}
-        
-    def load_tables(self):
-        res = requests.get(os.path.join(BASEURL, 'tables'))
-        
-        # Parse the XML
-        root = ET.fromstring(res.content)
-
-        # In this XML, the root element is in the "vosi" namespace but the child elements (schema, table, etc.)
-        # are unqualified (i.e. have no prefix). Thus, we can search for them without a namespace.
-        tables = []
-        for schema_elem in root.findall('schema'):
-            schema_name = schema_elem.find('name').text if schema_elem.find('name') is not None else None
-            
-            for table_elem in schema_elem.findall('table'):
-                table_name = table_elem.find('name').text if table_elem.find('name') is not None else None
-                columns = []
-                for col_elem in table_elem.findall('column'):
-                    col_name = col_elem.find('name').text if col_elem.find('name') is not None else None
-                    #dataType_elem = col_elem.find('dataType')
-                    #data_type = dataType_elem.text if dataType_elem is not None else None
-                    # The xsi:type attribute is in the XML namespace for xsi
-                    #xsi_type = dataType_elem.get('{http://www.w3.org/2001/XMLSchema-instance}type') if dataType_elem is not None else None
-                    columns.append(col_name)
-                
-                if schema_name == "public":
-                    name = table_name
-                else:
-                    name = f"{schema_name}.{table_name}"
-                    
-                tables.append(Table(name, columns))
-
-        self.tables = tables
-        
-    def print_tables(self):
-        pprint.pprint(self.tables)
-    
-    def get_table(self, name):
-        for table in self.tables:
-            if name in table.name:
-                return table
-        return None

adss/executors/async_query.py

@@ -1,123 +0,0 @@
-from astropy.io.votable import from_table, writeto
-from xml.dom import minidom
-from astropy.table import Table
-
-
-from adss.variables import BASEURL
-from adss.utils.format_table import format_result_table
-import requests
-import os
-
-import time
-
-import io
-
-async_url = os.path.join(BASEURL, "async")
-
-def execute_async(query, table_upload=None, refresh_rate=5):
-    """Perform async queries on splus cloud TAP service. 
-
-    Args:
-        query (str): query itself.
-        table_upload (pandas.DataFrame, optional): table to upload. Defaults to None.
-        publicdata (bool, optional): If internal wants to access public data. Defaults to None.
-
-    Returns:
-        astropy.table.Table: result table.
-    """        
-
-    data = {
-        "request": 'doQuery',
-        "version": '1.0',
-        "lang": 'ADQL',
-        "phase": 'run',
-        "query": query,
-        "format": 'csv'
-    }
-
-    if str(type(table_upload)) != "<class 'NoneType'>":
-        if 'astropy.table' in str(type(table_upload)):
-            if len(table_upload) > 6000:
-                print('Cutting to the first 6000 objects!')
-                table_upload = table_upload[0:6000]
-                table_upload = from_table(table_upload)
-
-                IObytes = io.BytesIO()
-                writeto(table_upload, IObytes)
-
-                IObytes.seek(0)
-            else:
-                table_upload = from_table(table_upload)
-
-                IObytes = io.BytesIO()
-                writeto(table_upload, IObytes)
-
-                IObytes.seek(0)
-
-        elif 'astropy.io.votable' in str(type(table_upload)):
-            if table_upload.get_first_table().nrows > 6000:
-                return 'votable bigger than 6000'
-            else:
-                IObytes = io.BytesIO()
-                writeto(table_upload, IObytes)
-                IObytes.seek(0)
-
-        elif 'DataFrame' in str(type(table_upload)):
-            if len(table_upload) > 6000:
-                print('Cutting to the first 6000 objects!')
-                table_upload = table_upload[0:6000]
-                table_upload = Table.from_pandas(table_upload)
-                table_upload = from_table(table_upload)
-                IObytes = io.BytesIO()
-                writeto(table_upload, IObytes)
-                IObytes.seek(0)
-            else:
-                table_upload = Table.from_pandas(table_upload)
-                table_upload = from_table(table_upload)
-                IObytes = io.BytesIO()
-                writeto(table_upload, IObytes)
-                IObytes.seek(0)
-                
-        else:
-            return 'Table type not supported'
-
-        data['upload'] = 'upload,param:uplTable'
-        res = requests.post(async_url, data = data, files={'uplTable': IObytes.read()})
-
-    if not table_upload:
-        res = requests.post(async_url, data = data)
-
-    xmldoc = minidom.parse(io.BytesIO(res.content))
-
-    try:
-        item = xmldoc.getElementsByTagName('phase')[0]
-        process = item.firstChild.data
-
-        item = xmldoc.getElementsByTagName('jobId')[0]
-        jobID = item.firstChild.data
-
-        while process == 'EXECUTING':
-            res = requests.get(os.path.join(async_url, jobID))
-            xmldoc = minidom.parse(io.BytesIO(res.content))
-
-            item = xmldoc.getElementsByTagName('phase')[0]
-            process = item.firstChild.data
-            time.sleep(refresh_rate)
-
-        if process == 'COMPLETED':
-            item = xmldoc.getElementsByTagName('result')[0]
-            link = item.attributes['xlink:href'].value
-
-            res = requests.get(link)
-
-            return format_result_table(Table.read(io.BytesIO(res.content), format="csv"))
-
-        if process == 'ERROR':
-            item = xmldoc.getElementsByTagName('message')[0]
-            message = item.firstChild.data
-
-            print("Error: ", message)
-
-    except:
-        item = xmldoc.getElementsByTagName('INFO')
-        print(item[0].attributes['value'].value, ": ", item[0].firstChild.data)

adss/executors/sync_query.py

@@ -1,42 +0,0 @@
-from adss.variables import BASEURL
-from adss.utils.format_table import format_result_table
-
-from astropy.table import Table
-from xml.dom import minidom
-import requests
-import os
-import io
-
-from requests.exceptions import Timeout
-
-sync_url = os.path.join(BASEURL, "sync")
-
-def execute_sync(query, timeout=20):
-    data = {
-        "request": "doQuery",
-        "version": "1.0",
-        "lang": "ADQL",
-        "phase": "run",
-        "query": query,
-        "format": "csv"
-    }
-
-    # Make request to TAP server
-    try:
-        res = requests.post(sync_url, data=data, timeout=20)
-    except Timeout:
-        raise Exception("Request to TAP server timed out, for large queries use async query")
-
-    # Handle errors from TAP response
-    if res.status_code != 200:
-        xmldoc = minidom.parse(io.BytesIO(res.content))
-        item = xmldoc.getElementsByTagName("INFO")
-        for i in item:
-            if i.getAttribute("name") == "QUERY_STATUS" and i.getAttribute("value") == "ERROR":
-                error_message = i.firstChild.data
-                raise Exception(f"ADQL Query Error: {error_message}")
-
-    # Convert CSV response to Astropy Table
-    return format_result_table(Table.read(io.BytesIO(res.content), format="csv"))
-
-

adss/operations/cone_search.py

@@ -1,21 +0,0 @@
-from adss.executors.sync_query import execute_sync
-from adss.executors.async_query import execute_async
-
-def cone_search(table, ra, dec, radius):
-    if radius < 0:
-        raise ValueError("Radius must be positive")
-    if radius > 60:
-        raise ValueError("Radius must be less than 60 arcsecs")
-    
-    query = f"""select * from {table}
-    WHERE 1 = CONTAINS( POINT('ICRS', ra, dec), 
-    CIRCLE('ICRS', {ra}, {dec}, {radius}./3600.))
-    """
-    return execute_sync(query)
-
-def large_cone_search(table, ra, dec, radius):
-    query = f"""select * from {table}
-    WHERE 1 = CONTAINS( POINT('ICRS', ra, dec), 
-    CIRCLE('ICRS', {ra}, {dec}, {radius}./3600.))
-    """
-    return execute_async(query)

adss/table.py

@@ -1,295 +0,0 @@
-from adss.executors.sync_query import execute_sync
-from adss.executors.async_query import execute_async
-from adss.utils import format_table
-
-import re
-
-class Table:
-    def __init__(self, name, columns):
-        self.name = name
-        self.columns = columns
-        self.selected_columns = []
-        self.constrains = []
-        
-    def __repr__(self):
-        return f"Table(name={self.name}, columns={len(self.columns)})"
-    
-    def __str__(self):
-        return f"Table: {self.name} ({len(self.columns)} columns)"
-    
-    def check_column(self, column):
-        return column in self.columns
-    
-    def format_columns(self, columns):
-        # Use provided columns list rather than an undefined variable
-        return ','.join(columns)
-    
-    def set_columns(self, columns):
-        if not isinstance(columns, list):
-            columns = [columns]
-        for column in columns:
-            if not self.check_column(column):
-                raise ValueError(f"Column {column} not in table {self.name}, options are {self.columns}")
-        self.selected_columns = columns
-    
-    def set_constrains(self, constrains):
-        self.constrains = constrains
-    
-    def cone_search(self, ra, dec, radius_arcsec, columns=None, method = 'sync'):
-        if radius_arcsec < 0:
-            raise ValueError("Radius must be positive")
-        if radius_arcsec > 60:
-            raise ValueError("Radius must be less than 60 arcsecs")
-        
-        if columns:
-            columns_str = self.format_columns(columns)
-        elif self.selected_columns:
-            columns_str = self.format_columns(self.selected_columns)
-        else:
-            columns_str = "*"  # Select all columns
-
-        constraints_str = ""
-        if self.constrains:
-            constraints_str = " AND (" + self.constrains + ")"
-            
-        query = f"""SELECT {columns_str} FROM {self.name}
-WHERE 1 = CONTAINS( 
-    POINT('ICRS', ra, dec), 
-    CIRCLE('ICRS', {ra}, {dec}, {radius_arcsec}/3600.0) 
-){constraints_str}
-"""
-                
-        print(query)
-        if method == 'sync':
-            return execute_sync(query)
-        else:
-            return execute_async(query)
-    
-    def cone_cross_match(
-            self, 
-            other_table, 
-            match_arcsec,
-            ra, 
-            dec,
-            radius_arcsec,
-            columns=None, 
-            other_columns=None,
-            other_suffix=None,
-            method='sync'
-        ):
-        """
-        Perform a cone search on the current table (t1) and then cross-match with another table (t2)
-        using a matching radius (match_arcsec).
-        
-        The query first restricts table t1 to a cone centered at (ra, dec) with a radius of radius_arcsec.
-        Then, for each object in t1, it finds matching objects in table t2 that lie within match_arcsec 
-        of the t1 object's coordinates.
-        
-        Additionally:
-          - If a non-empty `other_suffix` is provided, each selected column from t2 will be aliased with that suffix.
-          - The constraints for each table are processed so that the columns in the conditions are properly qualified with t1 or t2.
-        
-        Parameters:
-            other_table (Table): The table to match against (t2).
-            match_arcsec (float): The cross-match tolerance radius (in arcseconds) between t1 and t2.
-            ra (float): Right Ascension for the cone center (t1).
-            dec (float): Declination for the cone center (t1).
-            radius_arcsec (float): The cone search radius (in arcseconds) for filtering t1.
-            columns (list or None): Columns to select from the current table (t1).
-            other_columns (list or None): Columns to select from the other table (t2).
-            other_suffix (str or None): Optional suffix to append to each t2 column alias.
-            method (str): Use 'sync' for synchronous execution or 'async' for asynchronous.
-        
-        Returns:
-            The result of the query execution via execute_sync or execute_async.
-        """
-        
-        # Helper function to qualify constraint column names with the proper alias.
-        # It looks for each column name as a whole word (not already preceded by an alias) and prefixes it.
-        def apply_alias_to_constraint(constraint, alias, columns_list):
-            for col in columns_list:
-                # (?<![\w\.]) ensures that we do not match if the column is already prefixed (like t1.ra)
-                pattern = r'(?<![\w\.])\b' + re.escape(col) + r'\b'
-                constraint = re.sub(pattern, f"{alias}.{col}", constraint)
-            return constraint
-        
-        # Validate match_arcsec
-        if match_arcsec <= 0:
-            raise ValueError("Match radius must be positive")
-        if match_arcsec > 3:
-            print("Match radius may be too large; consider a value less than 3 arcsecs")
-        
-        # Determine columns for t1
-        if columns:
-            t1_columns_list = columns if isinstance(columns, list) else [columns]
-            t1_columns = ', '.join(f"t1.{col}" for col in t1_columns_list)
-        elif self.selected_columns:
-            t1_columns = ', '.join(f"t1.{col}" for col in self.selected_columns)
-        else:
-            t1_columns = "t1.*"
-        
-        # Determine columns for t2, adding suffix if provided
-        if other_columns:
-            t2_columns_list = other_columns if isinstance(other_columns, list) else [other_columns]
-            if other_suffix:
-                t2_columns = ', '.join(f"t2.{col} AS {col}{other_suffix}" for col in t2_columns_list)
-            else:
-                t2_columns = ', '.join(f"t2.{col}" for col in t2_columns_list)
-        elif other_table.selected_columns:
-            if other_suffix:
-                t2_columns = ', '.join(f"t2.{col} AS {col}{other_suffix}" for col in other_table.selected_columns)
-            else:
-                t2_columns = ', '.join(f"t2.{col}" for col in other_table.selected_columns)
-        else:
-            t2_columns = "t2.*"
-        
-        # Process constraints for t1: apply alias "t1" to each column mentioned in the constraint.
-        constraints_t1 = ""
-        if self.constrains:
-            if isinstance(self.constrains, str):
-                processed_constraint = apply_alias_to_constraint(self.constrains, "t1", self.columns)
-                constraints_t1 = " AND (" + processed_constraint + ")"
-            elif isinstance(self.constrains, list):
-                processed_constraints = []
-                for c in self.constrains:
-                    processed_constraints.append(apply_alias_to_constraint(c, "t1", self.columns))
-                constraints_t1 = " AND (" + " AND ".join(processed_constraints) + ")"
-
-        # Process constraints for t2: apply alias "t2" to each column mentioned in the constraint.
-        constraints_t2 = ""
-        if other_table.constrains:
-            if isinstance(other_table.constrains, str):
-                processed_constraint = apply_alias_to_constraint(other_table.constrains, "t2", other_table.columns)
-                constraints_t2 = " AND (" + processed_constraint + ")"
-            elif isinstance(other_table.constrains, list):
-                processed_constraints = []
-                for c in other_table.constrains:
-                    processed_constraints.append(apply_alias_to_constraint(c, "t2", other_table.columns))
-                constraints_t2 = " AND (" + " AND ".join(processed_constraints) + ")"
-        # Build the query:
-        # 1. The first CONTAINS clause performs the cross-match between t1 and t2 with match_arcsec tolerance.
-        # 2. The second CONTAINS clause restricts t1 objects to the cone centered at (ra, dec) with radius radius_arcsec.
-        query = f"""SELECT {t1_columns}, {t2_columns}
-FROM {self.name} AS t1, {other_table.name} AS t2
-WHERE 1 = CONTAINS(
-        POINT('ICRS', t2.ra, t2.dec),
-        CIRCLE('ICRS', t1.ra, t1.dec, {match_arcsec}/3600.0)
-    )
-AND 1 = CONTAINS(
-        POINT('ICRS', t1.ra, t1.dec),
-        CIRCLE('ICRS', {ra}, {dec}, {radius_arcsec}/3600.0)
-    )
-{constraints_t1}
-{constraints_t2}
-"""
-                
-        print(query)
-        if method == 'async':
-            return execute_async(query)
-        else:
-            return execute_sync(query)
-        
-    def table_cross_match(
-            self, 
-            other_table, 
-            match_arcsec,
-            columns=None, 
-            other_columns=None,
-            other_suffix=None,
-            method='async'
-        ):
-        """
-        Perform a cone search on the current table (t1) and then cross-match with another 
-        table (Dataframe or astropy Table) (t2)
-        using a matching radius (match_arcsec).
-        
-        For each object in t1, it finds matching objects in table t2 that lie within match_arcsec 
-        of the t1 object's coordinates.
-        
-        Additionally:
-          - If a non-empty `other_suffix` is provided, each selected column from t2 will be aliased with that suffix.
-          - The constraints for each table are processed so that the columns in the conditions are properly qualified with t1 or t2.
-        
-        Parameters:
-            other_table (astropy.table.Table): The table to match against (t2).
-            match_arcsec (float): The cross-match tolerance radius (in arcseconds) between t1 and t2.
-            columns (list or None): Columns to select from the current table (t1).
-            other_columns (list or None): Columns to select from the other table (t2).
-            other_suffix (str or None): Optional suffix to append to each t2 column alias.
-            method (str): Use 'sync' for synchronous execution or 'async' for asynchronous.
-        
-        Returns:
-            The result of the query execution via execute_sync or execute_async.
-        """
-        
-        # Helper function to qualify constraint column names with the proper alias.
-        # It looks for each column name as a whole word (not already preceded by an alias) and prefixes it.
-        def apply_alias_to_constraint(constraint, alias, columns_list):
-            for col in columns_list:
-                # (?<![\w\.]) ensures that we do not match if the column is already prefixed (like t1.ra)
-                pattern = r'(?<![\w\.])\b' + re.escape(col) + r'\b'
-                constraint = re.sub(pattern, f"{alias}.{col}", constraint)
-            return constraint
-        
-        # Validate match_arcsec
-        if match_arcsec <= 0:
-            raise ValueError("Match radius must be positive")
-        if match_arcsec > 3:
-            print("Match radius may be too large; consider a value less than 3 arcsecs")
-        
-        # Determine columns for t1
-        if columns:
-            t1_columns_list = columns if isinstance(columns, list) else [columns]
-            t1_columns = ', '.join(f"t1.{col}" for col in t1_columns_list)
-        elif self.selected_columns:
-            t1_columns = ', '.join(f"t1.{col}" for col in self.selected_columns)
-        else:
-            t1_columns = "t1.*"
-        
-        # Determine columns for t2, adding suffix if provided
-        if not other_columns:
-            raise ValueError("Must provide columns for the input table (other_columns param)")
-        
-        if not "ra" in other_columns or not "dec" in other_columns:
-            raise ValueError("Input table must have 'ra' and 'dec' columns")
-        
-        other_table = other_table[other_columns]
-        
-        t2_columns_list = other_columns if isinstance(other_columns, list) else [other_columns]
-        if other_suffix:
-            t2_columns = ', '.join(f"t2.{col} AS {col}{other_suffix}" for col in t2_columns_list)
-        else:
-            t2_columns = ', '.join(f"t2.{col}" for col in t2_columns_list)
-
-        # Process constraints for t1: apply alias "t1" to each column mentioned in the constraint.
-        constraints_t1 = ""
-        if self.constrains:
-            if isinstance(self.constrains, str):
-                processed_constraint = apply_alias_to_constraint(self.constrains, "t1", self.columns)
-                constraints_t1 = " (" + processed_constraint + ")"
-            elif isinstance(self.constrains, list):
-                processed_constraints = []
-                for c in self.constrains:
-                    processed_constraints.append(apply_alias_to_constraint(c, "t1", self.columns))
-                constraints_t1 = " (" + " AND ".join(processed_constraints) + ")"
-
-        if constraints_t1:
-            constraints_t1 = "WHERE " + constraints_t1
-        # Build the query:
-        # 1. The first CONTAINS clause performs the cross-match between t1 and t2 with match_arcsec tolerance.
-        # 2. The second CONTAINS clause restricts t1 objects to the cone centered at (ra, dec) with radius radius_arcsec.
-        query = f"""SELECT {t1_columns}, {t2_columns}
-FROM {self.name} AS t1 JOIN tap_upload.upload AS t2 ON
-1 = CONTAINS(
-        POINT('ICRS', t1.ra, t1.dec),
-        CIRCLE('ICRS', t2.ra, t2.dec, {match_arcsec}/3600.0)
-    )
-{constraints_t1}
-"""
-                
-        print(query)
-        if method == 'async':
-            return execute_async(query, table_upload=other_table)
-        else:
-            raise ValueError("Synchronous execution not supported yet for table cross-match")
-            #return execute_sync(query)

adss/utils/format_table.py

@@ -1,115 +0,0 @@
-import numpy as np
-from astropy.table import Table
-
-def vectorized_string_to_masked_array(column_data):
-    """
-    Fully vectorized conversion of formatted string arrays to NumPy masked arrays.
-    The strings are assumed to be wrapped in curly braces (e.g. "{1,2,3}").
-    Any occurrence of the literal "NULL" in a cell will be masked.
-    
-    Parameters
-    ----------
-    column_data : numpy.ndarray
-        A 1D NumPy array of strings. Each element is a formatted array like "{1,2,3}".
-        
-    Returns
-    -------
-    numpy.ma.MaskedArray
-        A masked array where "NULL" entries are masked.
-    """
-    # Remove curly braces (but do not remove "NULL")
-    clean_data = np.char.replace(column_data.astype(str), "{", "")
-    clean_data = np.char.replace(clean_data, "}", "")
-    
-    # Split each string by comma into a list of items (with possible surrounding whitespace)
-    split_arrays = np.char.split(clean_data, ",")
-    
-    # --- Determine type by scanning for a first non-"NULL" value ---
-    first_value = None
-    for row in split_arrays:
-        for item in row:
-            item_str = item.strip()
-            if item_str != "NULL":
-                first_value = item_str
-                break
-        if first_value is not None:
-            break
-            
-    # If no non-NULL value is found, default to a masked object array.
-    if first_value is None:
-        data = [np.array(row) for row in split_arrays]
-        mask = [np.full(len(row), True, dtype=bool) for row in split_arrays]
-        return np.ma.masked_array(data, mask=mask)
-    
-    # Try to determine numeric type.
-    # (If first_value consists solely of digits, we'll assume integer.
-    #  Otherwise, if it can be converted to float, we'll use float.
-    #  Else, we default to string.)
-    is_integer = first_value.isdigit()
-    is_float = False
-    if not is_integer:
-        try:
-            float(first_value)
-            is_float = True
-        except Exception:
-            pass
-
-    # Prepare lists to store converted rows and corresponding masks.
-    data_list = []
-    mask_list = []
-    
-    # Conversion helper functions
-    def convert_item(item, conv):
-        item = item.strip()
-        if item == "NULL":
-            return None, True
-        else:
-            return conv(item), False
-    
-    if is_integer:
-        conv_func = int
-        dtype = np.int64
-    elif is_float:
-        conv_func = float
-        dtype = np.float64
-    else:
-        conv_func = lambda x: x
-        dtype = object
-
-    # Process each row
-    for row in split_arrays:
-        row_vals = []
-        row_mask = []
-        for item in row:
-            val, is_mask = convert_item(item, conv_func)
-            # For masked numeric values, we insert a dummy (0 or 0.0) value.
-            if is_mask:
-                if dtype in (np.int64, np.float64):
-                    row_vals.append(0)
-                else:
-                    row_vals.append("")
-            else:
-                row_vals.append(val)
-            row_mask.append(is_mask)
-        # Convert row to an array of the target dtype.
-        row_arr = np.array(row_vals, dtype=dtype)
-        data_list.append(row_arr)
-        mask_list.append(np.array(row_mask, dtype=bool))
-    
-    # Create and return a masked array.
-    return np.ma.masked_array(data_list, mask=mask_list)
-
-def format_result_table(tab):
-    if tab is None or len(tab) == 0:
-        return None
-    
-    for col in tab.colnames:
-        if len(tab[col]) == 0:
-            continue
-        if not "<U" in str(tab[col].dtype):
-            continue
-        
-        if "{" in tab[col][0]:
-            tab[col] = vectorized_string_to_masked_array(tab[col])
-
-    return tab

adss/variables.py

@@ -1,3 +0,0 @@
-
-
-BASEURL = "http://andromeda.cbpf.br:8080/tap/tap"

adss-1.21.dist-info/RECORD

@@ -1,30 +0,0 @@
-adss/__init__.py,sha256=KiM0xXp_U9MqUIb_hLayoNW5lilW-LNSsH4PkV5dx-4,855
-adss/adss_manager.py,sha256=vaS6y1IycVW8AjpAQeG58VwjCDLyMBUylJzYSeg6D9o,2068
-adss/auth.py,sha256=M8GAN8pdfmJfsEOqv_EW2ru0uP0H1JtK7IfBDrIZMyg,4025
-adss/client.py,sha256=Ojc6jqZtCBMwRoTGuBiF0SEDkdWs_-xbGwyk03nHkr8,29613
-adss/exceptions.py,sha256=YeN-xRHvlSmwyS8ni2jOEhhgZK9J1jsG11pOedy3Gfg,1482
-adss/table.py,sha256=Ua663njPk2sg8BtQPo1wZ-V09YvnjrEyIb_SmBhdOYY,13383
-adss/utils.py,sha256=0RISndgXnwVy8cLMFa4Mm7CfGqwGdX-X-HZ0NmPDVD0,3558
-adss/variables.py,sha256=kmbwxJBDC97yKakrnBvONRh1FVvSXU4YKqnjExAU2ZA,51
-adss/endpoints/__init__.py,sha256=Pr29901fT8ClCS2GasTjTiBNyn7DfVfxILpYDFsMvPA,488
-adss/endpoints/admin.py,sha256=S6ZrkeA_Lh_LCpF1NHyfMKqjbIiylYXUSV65H_WKg1U,16391
-adss/endpoints/images.py,sha256=ItAiBss_jQvWQWRUvy0c9Cjn1r9lDR8eOPauqOcPcZ8,35777
-adss/endpoints/metadata.py,sha256=RPrRP6Uz6-uPMIcntMgfss9vAd5iN7JXjZbF8SW0EYg,8238
-adss/endpoints/queries.py,sha256=5BONw_IcGORMPNe-5J6BpoFY6z7lKcktEVhqZ9j17_8,17286
-adss/endpoints/users.py,sha256=6Abkl3c3_YKdMYR_JWI-uL9HTHxcjlIOnE29GyN5_QE,10811
-adss/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adss/executors/async_query.py,sha256=qmSm-Ex8ZJSjn8lmm_F5BufVpDV-w6vOqXie7krCp7k,3977
-adss/executors/sync_query.py,sha256=3e-ALG3GnA906o_oefci5XHNcdnoPWuc67ml-YATMKE,1243
-adss/models/__init__.py,sha256=ADWVaGy4dkpEMH3iS_6EnRSBlEgoM5Vy9zORQr-UG6w,404
-adss/models/metadata.py,sha256=6fdH_0BenVRmeXkkKbsG2B68O-N2FXTTRgxsEhAHRoU,4058
-adss/models/query.py,sha256=Af-iojZb-nO6qj-yMT_PlNM7Hip6EwBfNeaQPMJPNM0,4293
-adss/models/user.py,sha256=5qVT5qOktokmVLkGszPGCTZWv0wC-7aBMvJ8EeBOqdw,3493
-adss/operations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adss/operations/cone_search.py,sha256=qfdFA2TGqnzuggz4nep21_y4LgmHP4ZMpVupxn87dB0,706
-adss/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-adss/utils/format_table.py,sha256=UYCQ6Xum3dPHrh0cAh_KCj6vHShAvdHlV0rtIv7J09Q,3695
-adss-1.21.dist-info/LICENSE,sha256=1aYqcyqjrdNXY9hqgZkCWprcoA112oKvdrfPyvMYPTc,1468
-adss-1.21.dist-info/METADATA,sha256=M75h6eW69l2JcUGupkTkkQp2-pcW3qfgkmj3_5qFIpE,379
-adss-1.21.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-adss-1.21.dist-info/top_level.txt,sha256=ebD44L3R0PEvEFoRCJ-RjTIsQ9Yjpo2aAYC1BMtueLg,5
-adss-1.21.dist-info/RECORD,,