Merge pull request #17 from han-nwin/wip/python-version

Removed requirement version in requirements.txt

Author: ninthreezy

datatorch/api/client.py

@@ -1,5 +1,5 @@
 from typing import List, Union, cast, IO
-import requests, glob, os, cgi
+import requests, glob, os #, cgi
 from urllib.parse import urlencode
 
 from gql import Client as GqlClient, gql
@@ -12,6 +12,8 @@
 from datatorch.core import user_settings
 from typing import Any, TypeVar, Type
 
+from email.parser import HeaderParser
+
 T = TypeVar("T")
 
 
@@ -97,10 +99,6 @@ def api_url(self) -> str:
     def graphql_url(self) -> str:
         return self._graphql_url
 
-    @property
-    def graphql_url(self) -> str:
-        return self.transport.url
-
     def execute_files(
         self, paths: List[str], *args, params: dict = {}, **kwargs
     ) -> dict:
@@ -152,7 +150,7 @@ def download_file(
         skip: bool = True
         # For now, skip does nothing
     ):
-        ## If it exists and skip is true, do not download
+        # If it exists and skip is true, do not download
         # name = os.path.join(directory, name)
         # name = os.path.abspath(name)
         # This name overwrites the value into name
@@ -176,9 +174,19 @@ def download_file(
         )
 
         content = result.headers["content-disposition"]
-        _, value = cgi.parse_header(content)
-
-        name = name or value["filename"]
+        # _, value = cgi.parse_header(content)
+        parser = HeaderParser()
+        headers = parser.parsestr(f"Content-Disposition: {content}")
+        filename_param = headers.get_param("filename")
+        # Ensure filename is a string
+        if isinstance(filename_param, tuple):
+            filename = filename_param[0] or ""  # Use the first element of the tuple if present
+        elif isinstance(filename_param, str):
+            filename = filename_param
+        else:
+            filename = ""  # Default to an empty string if None or unexpected type
+
+        name = name or filename
         name = os.path.join(directory, name)
         name = os.path.abspath(name)
 

datatorch/utils/package.py

@@ -2,7 +2,7 @@
 import json
 import subprocess
 import urllib.request
-import pkg_resources
+from importlib.metadata import version
 
 
 def get_latest() -> str:
@@ -12,7 +12,7 @@ def get_latest() -> str:
 
 
 def get_version() -> str:
-    return pkg_resources.get_distribution("datatorch").version
+    return version("datatorch")
 
 
 def upgrade():

requirements.txt

@@ -1,3 +1,21 @@
-Click~=7.0
+Click==8.0.0
+gql
+websockets
+websocket-client
+requests
+typing_extensions
+psutil
+aiodocker
+Jinja2
+PyYAML
+aiostream
+markupsafe
+requests_toolbelt
+imantics
+shapely
+tqdm
+urllib3
 numpy
-pycocotools
+docker
+python-magic
+pycocotools

setup.py

@@ -1,7 +1,8 @@
 from setuptools import setup, find_packages
 import sys
 
-assert sys.version_info >= (3, 7, 0), "DataTorch requires Python 3.7+"
+# Ensure the Python version is 3.13 or higher
+assert sys.version_info >= (3, 13, 0), "DataTorch requires Python 3.13+"
 
 with open("README.md", "r", encoding="utf-8") as fp:
     long_description = fp.read()
@@ -21,16 +22,15 @@
     "markupsafe==2.0.1",
     "requests_toolbelt==0.10.1",
     "imantics==0.1.12",
-    "shapely==2.0.1",
+    "shapely==2.0.6",  # Compatible Python 3.13
     "tqdm~=4.65.0",
     "urllib3==1.26.15",
     "numpy",
     "docker",
     "python-magic",
+    "pycocotools",
 ]
 
-requirements_agents = []
-
 setup(
     name="datatorch",
     version="0.4.8.4",
@@ -45,8 +45,7 @@
     long_description=long_description,
     long_description_content_type="text/markdown",
     install_requires=requirements,
-    extras_require={"agent": requirements_agents},
-    python_requires=">=3.7",
+    python_requires=">=3.13",
     license="MIT license",
     zip_safe=False,
     include_package_data=True,
@@ -56,10 +55,7 @@
         "Framework :: Pytest",
         "Intended Audience :: Developers",
         "Natural Language :: English",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.13",
         "Topic :: Scientific/Engineering :: Artificial Intelligence",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],