reorganize the folder structure

Author: ZihengSun

.DS_Store

@@ -1 +1 @@
-from pygeoweaver.sc_interface import *
+from pygeoweaver.commands.pgw_interface import *

pygeoweaver/__init__.py

@@ -24,12 +24,12 @@
     helpwith,
 )
 from pygeoweaver.constants import GEOWEAVER_DEFAULT_ENDPOINT_URL
-from pygeoweaver.sc_create import create_process, create_process_from_file, create_workflow
-from pygeoweaver.sc_detail import get_process_code
-from pygeoweaver.sc_find import get_process_by_id, get_process_by_language, get_process_by_name
-from pygeoweaver.sc_history import get_process_history, get_workflow_history
-from pygeoweaver.sc_list import list_processes_in_workflow
-from pygeoweaver.sc_sync import sync, sync_workflow
+from pygeoweaver.commands.pgw_create import create_process, create_process_from_file, create_workflow
+from pygeoweaver.commands.pgw_detail import get_process_code
+from pygeoweaver.commands.pgw_find import get_process_by_id, get_process_by_language, get_process_by_name
+from pygeoweaver.commands.pgw_history import get_process_history, get_workflow_history
+from pygeoweaver.commands.pgw_list import list_processes_in_workflow
+from pygeoweaver.commands.pgw_sync import sync, sync_workflow
 from pygeoweaver.server import check_geoweaver_status, show
 from halo import Halo
 

pygeoweaver/__main__.py

@@ -0,0 +1,16 @@
+"""
+All functions of subcommand interfaces
+"""
+from pygeoweaver.commands.pgw_detail import *
+from pygeoweaver.commands.pgw_list import *
+from pygeoweaver.commands.pgw_export import *
+from pygeoweaver.commands.pgw_history import *
+from pygeoweaver.commands.pgw_import import *
+from pygeoweaver.commands.pgw_list import *
+from pygeoweaver.commands.pgw_run import *
+from pygeoweaver.server import *
+from pygeoweaver.commands.pgw_resetpassword import *
+from pygeoweaver.commands.pgw_help import *
+from pygeoweaver.commands.pgw_create import *
+from pygeoweaver.commands.pgw_sync import *
+from pygeoweaver.commands.pgw_find import *

pygeoweaver/sc_create.py renamed to pygeoweaver/commands/pgw_create.py

@@ -7,7 +7,7 @@
 import zipfile
 import urllib.request
 
-from pygeoweaver.utils import get_home_dir, get_java_bin_path
+from pygeoweaver.utils import get_home_dir, get_java_bin_path, safe_exit
 
 
 def install_jdk():
@@ -196,7 +196,7 @@ def install_java():
             os.system(f"sudo {package_manager} install -y default-jre default-jdk")
         else:
             print("Package manager not found. Unable to install Java.")
-            sys.exit(1)
+            safe_exit(1)
     elif system == "Windows":
         # note: this requires admin access to the pc, else it will fail saying
         # Access to the path 'C:\ProgramData\chocolatey\lib-bad' is denied.
@@ -208,7 +208,7 @@ def install_java():
         os.system("choco install -y openjdk")
     else:
         print("Unsupported operating system.")
-        sys.exit(1)
+        safe_exit(1)
 
 
 def is_java_installed():

pygeoweaver/sc_detail.py renamed to pygeoweaver/commands/pgw_detail.py

@@ -16,6 +16,7 @@
     get_logger,
     get_module_absolute_path,
     get_root_dir,
+    safe_exit,
 )
 
 """
@@ -75,7 +76,7 @@ def start_on_windows():
             java_cmd = os.path.join(jdk_home, "bin", "java.exe")
             if not os.path.exists(java_cmd):
                 print("Java command not found.")
-                sys.exit(1)
+                safe_exit(1)
 
     with Halo(text=f'Starting Geowaever...', spinner='dots'):
         geoweaver_jar = os.path.join(home_dir, "geoweaver.jar")
@@ -101,13 +102,13 @@ def start_on_windows():
                     with open(log_file, "r") as f:
                         print(f.read())
                     print("Success: Geoweaver is up")
-                    sys.exit(0)
+                    safe_exit(0)
             except Exception as e:
                 # print(f"Error occurred during request: {e}")
                 continue
 
         print("Error: Geoweaver is not up")
-        sys.exit(1)
+        safe_exit(1)
 
 
 def stop_on_windows():
@@ -146,7 +147,7 @@ def start_on_mac_linux(force_restart=True):
     java_path = check_java_exists()
     if java_path is None:
         print("Java not found. Exiting...")
-        sys.exit(1)
+        safe_exit(1)
 
     with Halo(text=f'Starting Geoweaver...', spinner='dots'):
         # Start Geoweaver
@@ -176,10 +177,10 @@ def start_on_mac_linux(force_restart=True):
 
         if counter == max_counter:
             print("Error: Geoweaver is not up")
-            sys.exit(1)
+            safe_exit(1)
         else:
             print("Success: Geoweaver is up")
-            sys.exit(0)
+            safe_exit(0)
 
 
 def stop_on_mac_linux() -> int:
@@ -227,7 +228,7 @@ def stop():
         #     cwd=f"{get_root_dir()}/",
         #     shell=True,
         # )
-        sys.exit(stop_on_mac_linux())
+        safe_exit(stop_on_mac_linux())
 
 
 def show(geoweaver_url=GEOWEAVER_DEFAULT_ENDPOINT_URL):

pygeoweaver/sc_export.py renamed to pygeoweaver/commands/pgw_export.py

@@ -11,6 +11,22 @@
 from pygeoweaver.constants import GEOWEAVER_URL
 
 
+def safe_exit(code=0):
+    """
+    Safely exit the script or notebook session.
+
+    Parameters:
+    - code (int): Exit status code (default: 0 for success).
+    """
+    if 'ipykernel' in sys.modules:
+        # Running in Jupyter notebook or IPython
+        # don't exit at all in Jupyter
+        pass
+    else:
+        # Running in a terminal or other environment
+        safe_exit(code)
+
+
 def get_home_dir():
     """
     Get the user's home directory.

pygeoweaver/sc_find.py renamed to pygeoweaver/commands/pgw_find.py

@@ -1,7 +1,7 @@
 from io import StringIO
 import sys
 import unittest
-from pygeoweaver.sc_detail import detail_host, detail_process, detail_workflow
+from pygeoweaver.commands.pgw_detail import detail_host, detail_process, detail_workflow
 from pygeoweaver.utils import get_logger