EUCLIDPCR-1971 Unable to upload user table from fits file

Author: Jorge Fernandez Hernandez

astroquery/utils/tap/core.py

@@ -1341,7 +1341,7 @@ def upload_table(self, *, upload_resource=None, table_name=None, table_descripti
             resource temporary table name associated to the uploaded resource
         table_description : str, optional, default None
             table description
-        format : str, optional, default 'VOTable'
+        format : str, optional, default 'votable'
             resource format
         verbose : bool, optional, default 'False'
             flag to display information about the process
@@ -1381,9 +1381,7 @@ def upload_table(self, *, upload_resource=None, table_name=None, table_descripti
             log.info(f"Uploaded table '{table_name}'.")
             return None
 
-    def __uploadTableMultipart(self, resource, *, table_name=None,
-                               table_description=None,
-                               resource_format="VOTable",
+    def __uploadTableMultipart(self, resource, *, table_name=None, table_description=None,  resource_format="votable",
                                verbose=False):
         connHandler = self.__getconnhandler()
         if isinstance(resource, Table):
@@ -1397,24 +1395,34 @@ def __uploadTableMultipart(self, resource, *, table_name=None,
             fh = tempfile.NamedTemporaryFile(delete=False)
             resource.write(fh, format='votable')
             fh.close()
-            f = open(fh.name, "r")
-            chunk = f.read()
-            f.close()
+
+            with open(fh.name, "r") as f:
+                chunk = f.read()
+
             os.unlink(fh.name)
             files = [['FILE', 'pytable', chunk]]
-            contentType, body = connHandler.encode_multipart(args, files)
+            content_type, body = connHandler.encode_multipart(args, files)
         else:
             if not (str(resource).startswith("http")):  # upload from file
                 args = {
                     "TASKID": str(-1),
                     "TABLE_NAME": str(table_name),
                     "TABLE_DESC": str(table_description),
-                    "FORMAT": str(resource_format)}
+                    "FORMAT": 'votable'}
                 log.info(f"Sending file: {resource}")
-                with open(resource, "r") as f:
+
+                t = Table.read(str(resource) )
+                fh = tempfile.NamedTemporaryFile(delete=False)
+                t.write(fh, format='votable')
+                fh.close()
+
+                with open(fh.name, "r") as f:
                     chunk = f.read()
-                files = [['FILE', os.path.basename(resource), chunk]]
-                contentType, body = connHandler.encode_multipart(args, files)
+
+                os.unlink(fh.name)
+                files = [['FILE', 'pytable', chunk]]
+
+                content_type, body = connHandler.encode_multipart(args, files)
             else:  # upload from URL
                 args = {
                     "TASKID": str(-1),
@@ -1423,8 +1431,8 @@ def __uploadTableMultipart(self, resource, *, table_name=None,
                     "FORMAT": str(resource_format),
                     "URL": str(resource)}
                 files = [['FILE', "", ""]]
-                contentType, body = connHandler.encode_multipart(args, files)
-        response = connHandler.execute_upload(body, contentType)
+                content_type, body = connHandler.encode_multipart(args, files)
+        response = connHandler.execute_upload(body, content_type)
         if verbose:
             print(response.status, response.reason)
             print(response.getheaders())

docs/esa/euclid/euclid.rst

@@ -863,7 +863,9 @@ surrounded by quotation marks, i.e.: *user_<your_login_name>."<table_name>"*):
 2.5.2. Uploading table from file
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-A file containing a table (votable, fits or csv) can be uploaded to the user's private area.
+A file containing a table can be uploaded to the user private area. Only the formats described https://docs.astropy.org/en/stable/io/unified.html#built-in-table-readers-writers,
+and automatically identified by its suffix or content can be used. Note that for a multi-extension fits file with multiple
+tables, the first table found will be read.
 
 The parameter 'format' must be provided when the input file is not a votable file.
 

docs/gaia/gaia.rst

@@ -581,7 +581,9 @@ surrounded by quotation marks, i.e.: *user_<your_login_name>."<table_name>"*)::
 2.3.2. Uploading table from file
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-A file containing a table (votable, fits or csv) can be uploaded to the user private area.
+A file containing a table can be uploaded to the user private area. Only the formats described https://docs.astropy.org/en/stable/io/unified.html#built-in-table-readers-writers,
+and automatically identified by its suffix or content can be used. Note that for a multi-extension fits file with multiple
+tables, the first table found will be read.
 
 The parameter 'format' must be provided when the input file is not a votable file.
 
@@ -665,7 +667,7 @@ A table from the user private area can be deleted as follows::
 
   >>> from astroquery.gaia import Gaia
   >>> Gaia.login_gui()
-  >>> job = Gaia.delete_user_table("table_test_from_file")
+  >>> job = Gaia.delete_user_table(table_name="table_test_from_file")
   Table 'table_test_from_file' deleted.
 
 2.5. Updating table metadata