Merge pull request #18 from ZihengSun/main

bump 0.7.2
ESIPFed · Jun 21, 2023 · 6493b53 · 6493b53
2 parents f8872ff + af5fab4
commit 6493b53
Show file tree

Hide file tree

Showing 9 changed files with 248 additions and 35 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pygeoweaver/sc_create.py b/pygeoweaver/sc_create.py
@@ -3,7 +3,7 @@
 import pandas as pd
 from pydantic import BaseModel
 
-from . import constants
+from pygeoweaver.constants import *
 from pygeoweaver.utils import (
     download_geoweaver_jar,
     get_geoweaver_jar_path,
@@ -63,9 +63,9 @@ def create_process(lang, description, name, code, owner="111111", confidential=F
     )
     data_json = process.json()
     r = requests.post(
-        f"{constants.GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/add/process",
+        f"{GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/add/process",
         data=data_json,
-        headers=constants.COMMON_API_HEADER,
+        headers=COMMON_API_HEADER,
     )
     if check_ipython() and r.ok:
         df = pd.DataFrame(json.loads(data_json).items(), columns=["Key", "Value"])
@@ -133,9 +133,9 @@ def create_workflow(
     )
     data_json = workflow.json()
     r = requests.post(
-        f"{constants.GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/add/workflow",
+        f"{GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/add/workflow",
         data=data_json,
-        headers=constants.COMMON_API_HEADER,
+        headers=COMMON_API_HEADER,
     )
     if check_ipython():
         return pd.DataFrame(json.loads(data_json).items(), columns=["Key", "Value"])

diff --git a/pygeoweaver/sc_detail.py b/pygeoweaver/sc_detail.py
@@ -5,7 +5,7 @@
 import subprocess
 
 import requests
-from . import constants
+from pygeoweaver.constants import *
 
 from pygeoweaver.utils import (
     download_geoweaver_jar,
@@ -65,7 +65,7 @@ def detail_host(host_id):
 
 def get_process_code(process_id):
     r = requests.post(
-        f"{constants.GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/detail",
+        f"{GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/detail",
         data={"type": "process", "id": process_id},
     ).json()
     return r["code"]
diff --git a/pygeoweaver/sc_find.py b/pygeoweaver/sc_find.py
@@ -1,11 +1,11 @@
 import requests
-from . import constants
+from pygeoweaver.constants import *
 import pandas as pd
 
 
 def get_process_by_name(process_name):
     response = requests.post(
-        f"{constants.GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/list", data={"type": "process"}
+        f"{GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/list", data={"type": "process"}
     )
     process_list = response.json()
 
@@ -22,7 +22,7 @@ def get_process_by_name(process_name):
 
 def get_process_by_id(process_id):
     response = requests.post(
-        f"{constants.GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/list", data={"type": "process"}
+        f"{GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/list", data={"type": "process"}
     )
     process_list = response.json()
 
@@ -39,7 +39,7 @@ def get_process_by_id(process_id):
 
 def get_process_by_language(language):
     response = requests.post(
-        f"{constants.GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/list", data={"type": "process"}
+        f"{GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/list", data={"type": "process"}
     )
     process_list = response.json()
 

diff --git a/pygeoweaver/sc_history.py b/pygeoweaver/sc_history.py
@@ -3,7 +3,7 @@
 import pandas as pd
 import requests
 
-from . import constants
+from pygeoweaver.constants import *
 from pygeoweaver.utils import (
     download_geoweaver_jar,
     get_geoweaver_jar_path,
@@ -35,7 +35,7 @@ def get_process_history(process_id):
     download_geoweaver_jar()
     try:
         r = requests.post(
-            f"{constants.GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/logs",
+            f"{GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/logs",
             data={"type": "process", "id": process_id},
         ).json()
         df = pd.DataFrame(r)
@@ -59,7 +59,7 @@ def get_workflow_history(workflow_id):
         raise Exception("please pass `workflow_id` as a parameter to the function.")
     try:
         r = requests.post(
-            f"{constants.GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/logs",
+            f"{GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/logs",
             data={"type": "workflow", "id": workflow_id},
         ).json()
         df = pd.DataFrame(r)

diff --git a/pygeoweaver/sc_list.py b/pygeoweaver/sc_list.py
@@ -2,7 +2,7 @@
 
 import requests
 import subprocess
-from . import constants
+from pygeoweaver.constants import *
 from pygeoweaver.utils import (
     download_geoweaver_jar,
     get_geoweaver_jar_path,
@@ -34,7 +34,7 @@ def list_processes_in_workflow(workflow_id):
     download_geoweaver_jar()
     payload = {"id": workflow_id, "type": "workflow"}
     r = requests.post(
-        f"{constants.GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/detail", data=payload
+        f"{GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/detail", data=payload
     )
     nodes = json.loads(r.json()["nodes"])
     result = [

diff --git a/pygeoweaver/sc_run.py b/pygeoweaver/sc_run.py
@@ -11,7 +11,7 @@
     get_java_bin_path,
     get_root_dir,
 )
-from . import constants
+from pygeoweaver.constants import *
 
 
 def run_process(
@@ -42,12 +42,12 @@ def run_process(
         context = f.read()
         f.close()
         details = requests.post(
-            f"{constants.GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/detail",
+            f"{GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/detail",
             data={"type": "process", "id": process_id},
         ).json()
         details["code"] = context
         requests.post(
-            f"{constants.GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/edit/process",
+            f"{GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/edit/process",
             data=json.dumps(details),
             headers={"Content-Type": "application/json"},
         )

diff --git a/pygeoweaver/sc_sync.py b/pygeoweaver/sc_sync.py
@@ -5,7 +5,7 @@
 import requests
 import typing
 
-from . import constants
+from pygeoweaver.constants import *
 from pygeoweaver.utils import (
     download_geoweaver_jar,
     copy_files,
@@ -18,7 +18,7 @@ def sync(process_id: str, local_path: typing.Union[str, os.PathLike], direction:
         if not local_path:
             raise Exception("Sync path not found.")
         r = requests.post(
-            f"{constants.GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/detail",
+            f"{GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/detail",
             data={"type": "process", "id": process_id},
         ).json()
         code = r["code"]
@@ -40,14 +40,14 @@ def sync(process_id: str, local_path: typing.Union[str, os.PathLike], direction:
         if not local_path:
             raise Exception("Sync path not found.")
         process_prev_state = requests.post(
-            f"{constants.GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/detail",
+            f"{GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/detail",
             data={"type": "process", "id": process_id},
         ).json()
         with open(local_path, "r") as f:
             f_content = f.read()
             process_prev_state["code"] = f_content
         requests.post(
-            f"{constants.GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/edit/process",
+            f"{GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/edit/process",
             data=json.dumps(process_prev_state),
             headers={"Content-Type": "application/json"},
         )
@@ -61,7 +61,7 @@ def sync_workflow(workflow_id: str, sync_to_path: typing.Union[str, os.PathLike]
     download_geoweaver_jar()
     # download workflow
     r = requests.post(
-        f"{constants.GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/downloadworkflow",
+        f"{GEOWEAVER_DEFAULT_ENDPOINT_URL}/web/downloadworkflow",
         data={"id": workflow_id, "option": "workflowwithprocesscodeallhistory"},
     ).text
     filename = r.rsplit("/")[-1]

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,13 +4,13 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pygeoweaver"
-version = "0.7.1"
+version = "0.7.2"
 authors = [
   { name="Geoweaver team", email="[email protected]" },
 ]
 description = "This is a wrapper package of the Geoweaver app."
 readme = "README.md"
-requires-python = ">=3.7"
+requires-python = ">=3.7,<4"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
@@ -22,14 +22,14 @@ classifiers = [
 
 [tool.poetry]
 name = "pygeoweaver"
-version = "0.7.1"
+version = "0.7.2"
 description = "This is a wrapper package of the Geoweaver app."
 authors = ["Geoweaver team <[email protected]>"]
 readme = "README.md"
 homepage = "https://github.com/ESIPFed/pygeoweaver"
 
 [tool.poetry.dependencies]
-python = ">=3.7"
+python = ">=3.7,<4"
 setuptools = ">=61.0"
 requests = "2.28.2"
 pydantic = "1.10.9"