Merge pull request #7 from allenhaozi/fix/fix-version-compatibility

fix version compatibility

Author: dingzhaohan

.gitignore

@@ -158,3 +158,5 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+# local dev code
+dev

requirements.txt

@@ -5,4 +5,5 @@ requests==2.31.0
 anyio==4.1.0
 httpx==0.25.2
 distro==1.8.0
-pydantic==2.4.2
+pydantic==2.4.2
+tqdm==4.66.4

src/bohrium/__init__.py

@@ -1,5 +1,7 @@
 from ._client import Bohrium, AsyncBohrium
 from ._base_client import AsyncAPIClient, SyncAPIClient
+from ._utils._logs import setup_logging as _setup_logging
 
+_setup_logging()
 
 __all__ = ["Bohrium", "AsyncBohrium", "AsyncAPIClient", "SyncAPIClient"]

src/bohrium/_base_client.py

@@ -12,6 +12,7 @@
     TypeVar,
     Union,
     cast,
+    Optional
 )
 from urllib.parse import urljoin
 
@@ -22,7 +23,7 @@
 from ._constants import DEFAULT_CONNECTION_LIMITS, DEFAULT_MAX_RETRIES, DEFAULT_TIMEOUT
 from ._utils import lru_cache
 
-logger = logging.Logger = logging.getLogger(__name__)
+logger = logging.getLogger(__name__)
 
 Arch = Union[Literal["x32", "x64", "arm", "arm64", "unknown"]]
 
@@ -118,12 +119,12 @@ class BaseClient(Generic[_HttpxClientT]):
     def __init__(
         self,
         *,
-        _version: str | None = None,
-        base_url: str | URL,
+        _version: Optional[str] = None,
+        base_url: Union[str, URL],
         limits: httpx.Limits,
         max_retries: int = DEFAULT_MAX_RETRIES,
-        timeout: float | Timeout | None = DEFAULT_TIMEOUT,
-        custom_headers: Mapping[str, str] | None = None,
+        timeout: Optional[Union[float, httpx.Timeout]] = DEFAULT_TIMEOUT,
+        custom_headers: Optional[Mapping[str, str]] = None,
     ):
         self._base_url = self._enforce_trailing_slash(URL(base_url))
         self._version = _version
@@ -148,7 +149,7 @@ def _build_headers(self, custom_headers) -> httpx.Headers:
     def _build_params(self, custom_params) -> dict[str, str]:
         params = _merge_mappings(self.default_params, custom_params)
         return params
-    
+
     @property
     def custom_auth(self) -> httpx.Auth | None:
         return None
@@ -224,13 +225,13 @@ class SyncAPIClient(BaseClient[httpx.Client]):
 
     def __init__(
         self,
-        base_url: str | URL,
+        base_url: Union[str, httpx.URL],
         max_retries: int = DEFAULT_MAX_RETRIES,
-        timeout: float | Timeout | None = DEFAULT_TIMEOUT,
+        timeout: Union[float, Timeout, None] = DEFAULT_TIMEOUT,
         limits: Limits = DEFAULT_CONNECTION_LIMITS,
-        _version: str | None = None,
-        http_client: httpx.Client | None = None,
-        custom_headers: Mapping[str, str] | None = None,
+        _version: Optional[str] = None,
+        http_client: Optional[httpx.Client] = None,
+        custom_headers: Optional[Mapping[str, str]] = None,
     ) -> None:
 
         if http_client is not None and not isinstance(

src/bohrium/_client.py

@@ -1,9 +1,7 @@
-# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
 from __future__ import annotations
 
 import os
-from typing import Mapping
+from typing import Mapping, Optional, Union
 
 from httpx import URL, Client, Response, Timeout
 from typing_extensions import override
@@ -23,12 +21,12 @@ class Bohrium(SyncAPIClient):
 
     def __init__(
         self,
-        access_key: str | None = None,
-        base_url: str | URL | None = None,
-        project_id: str | None = None,
-        timeout: float | Timeout | None = 30.0,
-        max_retries: int | None = DEFAULT_MAX_RETRIES,
-        http_client: Client | None = None,
+        access_key: Optional[str] = None,
+        base_url: Optional[Union[str, URL]] = None,
+        project_id: Optional[str] = None,
+        timeout: Optional[Union[float, Timeout]] = 30.0,
+        max_retries: Optional[int] = DEFAULT_MAX_RETRIES,
+        http_client: Optional[Client] = None,
     ) -> None:
         """Construct a new synchronous openai client instance."""
         if access_key is None:
@@ -54,7 +52,7 @@ def __init__(
 
         if base_url is None:
             base_url = "https://openapi.dp.tech"
-        
+
         super().__init__(
             _version=__version__,
             base_url=base_url,
@@ -65,7 +63,6 @@ def __init__(
         )
 
         self.job = resources.Job(self)
-        
 
     @property
     @override
@@ -120,5 +117,3 @@ def _make_status_error(
 
 class AsyncBohrium(AsyncAPIClient):
     pass
-
-

src/bohrium/_utils/__init__.py

@@ -1,3 +1,3 @@
 from ._utils import lru_cache
 
-__all__ = ["lru_cache"]
+__all__ = ["lru_cache"]

src/bohrium/_utils/_logs.py

@@ -14,7 +14,7 @@ def _basic_config() -> None:
 
 
 def setup_logging() -> None:
-    env = os.environ.get("BOHRIUM_LOG")
+    env = os.environ.get("BOHRIUM_LOG_LEVEL", "info")
     if env == "debug":
         _basic_config()
         logger.setLevel(logging.DEBUG)

src/bohrium/resources/job/job.py

@@ -1,36 +1,45 @@
 import logging
-from ..._resource import AsyncAPIResource, SyncAPIResource
-from ..tiefblue.tiefblue import Tiefblue
-from ...types.job.job import JobAddRequest
+import os
+import uuid
+from pathlib import Path
+
 # from ..._resource import BaseClient
 from pprint import pprint
 from typing import Optional
-import os
-from pathlib import Path
-import uuid
-# log: logging.Logger = logging.getLogger(__name__)
+
+from ..._resource import AsyncAPIResource, SyncAPIResource
+from ...types.job.job import JobAddRequest
+from ..tiefblue.tiefblue import Tiefblue
+
+log = logging.getLogger(__name__)
 
 
 class Job(SyncAPIResource):
 
+    def detail(self, job_id):
+        log.info(f"detail job {job_id}")
+        response = self._client.get(f"/openapi/v1/job/{job_id}")
+        log.debug(response)
+        return response.json().get("data")
+
     def submit(
-        self, 
-        project_id: int, 
+        self,
+        project_id: int,
         job_name: str,
         machine_type: str,
         cmd: str,
         image_address: str,
         job_group_id: int = 0,
-        work_dir: str = '',
-        result: str = '',
+        work_dir: str = "",
+        result: str = "",
         dataset_path: list = [],
         log_files: list = [],
         out_files: list = [],
     ):
         # log.info(f"submit job {name},project_id:{project_id}")
         data = self.create_job(project_id, job_name, job_group_id)
         print(data)
-        if work_dir != '':
+        if work_dir != "":
             if not os.path.exists(work_dir):
                 raise FileNotFoundError
             if os.path.isdir(work_dir):
@@ -39,11 +48,11 @@ def submit(
                 file_name = os.path.basename(work_dir)
                 object_key = os.path.join(data["storePath"], file_name)
                 self.upload(work_dir, object_key, data["token"])
-                
+
         ep = os.path.expanduser(result)
         p = Path(ep).absolute().resolve()
         p = p.joinpath(str(uuid.uuid4()) + "_temp.zip")
-        
+
         job_add_request = JobAddRequest(
             download_path=str(p.absolute().resolve()),
             dataset_path=dataset_path,
@@ -55,47 +64,43 @@ def submit(
             scass_type=machine_type,
             cmd=cmd,
             log_files=log_files,
-            out_files=out_files
+            out_files=out_files,
         )
         return self.insert(job_add_request.to_dict())
-    
+
     def insert(self, data):
         # log.info(f"insert job {data}")
-        response = self._client.post(f"/openapi/v2/job/add", json=data)
+        response = self._client.post("/openapi/v2/job/add", json=data)
         pprint(response.request)
         print(response.json())
-    
+
     def delete(self, job_id):
         # log.info(f"delete job {job_id}")
         response = self._client.post(f"/openapi/v1/job/del/{job_id}")
         pprint(response.request)
         print(response.json())
-        
+
     def terminate(self, job_id):
         # log.info(f"terminate job {job_id}")
         response = self._client.post(f"/openapi/v1/job/terminate/{job_id}")
         pprint(response.request)
         print(response.json())
-        
+
     def kill(self, job_id):
         # log.info(f"kill job {job_id}")
         response = self._client.post(f"/openapi/v1/job/kill/{job_id}")
         pprint(response.request)
         print(response.json())
-        
+
     def log(self, job_id, log_file="STDOUTERR", page=-1, page_size=8192):
         # log.info(f"log job {job_id}")
-        response = self._client.get(f"/openapi/v1/job/{job_id}/log", params={"logFile": log_file, "page": page, "pageSize": page_size})
+        response = self._client.get(
+            f"/openapi/v1/job/{job_id}/log",
+            params={"logFile": log_file, "page": page, "pageSize": page_size},
+        )
         pprint(response.request)
         print(response.json().get("data")["log"])
         return response.json().get("data")["log"]
-        
-    def detail(self, job_id):
-        # log.info(f"detail job {job_id}")
-        response = self._client.get(f"/openapi/v1/job/{job_id}")
-        pprint(response.request)
-        print(response.json())
-        return response.json().get("data")
 
     def create_job(
         self,
@@ -104,25 +109,28 @@ def create_job(
         group_id: Optional[int] = 0,
     ):
         # log.info(f"create job {name}")
-        response = self._client.get(f"/openapi/v1/ak/get")
-        
+        response = self._client.get("/openapi/v1/ak/get")
+
         data = {
             "userId": response.json().get("data").get("user_id"),
             "projectId": project_id,
             "name": name,
             "bohrGroupId": group_id,
         }
-        response = self._client.post(f"/openapi/v1/job/pre_create", json=data)
+        response = self._client.post("/openapi/v1/job/pre_create", json=data)
         pprint(response.request)
         print(response.json())
         return response.json().get("data")
-    
+
     def create_job_group(self, project_id, job_group_name):
         # log.info(f"create job group {job_group_name}")
-        response = self._client.post(f"/openapi/v1/job_group/add", json={"name": job_group_name, "projectId": project_id})
+        response = self._client.post(
+            "/openapi/v1/job_group/add",
+            json={"name": job_group_name, "projectId": project_id},
+        )
         pprint(response.request)
         print(response.json())
-        
+
     def upload(
         self,
         file_path: str,
@@ -131,25 +139,23 @@ def upload(
     ):
         tiefblue = Tiefblue()
         tiefblue.upload_From_file_multi_part(
-            object_key=object_key,
-            file_path=file_path,
-            progress_bar=True)
-        
+            object_key=object_key, file_path=file_path, progress_bar=True
+        )
+
     def uploadr(self, work_dir, store_path, token):
-        if not work_dir.endswith('/'):
-            work_dir = work_dir + '/'
+        if not work_dir.endswith("/"):
+            work_dir = work_dir + "/"
         for root, _, files in os.walk(work_dir):
             for file in files:
                 full_path = os.path.join(root, file)
                 object_key = full_path.replace(work_dir, store_path)
                 self.upload(full_path, object_key, token)
 
-
     def download(self, job_id, save_path):
         detail = self.detail(job_id)
         tiefblue = Tiefblue()
         tiefblue.download_from_url(detail["resultUrl"], save_path)
-        
+
+
 class AsyncJob(AsyncAPIResource):
     pass
-