Add default internal networks for each service

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+
+### Changed
+- Enable internal network names for each service [#638](https://github.com/IN-CORE/pyincore/issues/638)
+
+
 ## [1.20.1] - 2024-11-01
 
 ### Fixed

pyincore/dataservice.py

@@ -31,12 +31,27 @@ class DataService:
 
     def __init__(self, client: IncoreClient):
         self.client = client
-        self.base_url = urljoin(client.service_url, "data/api/datasets/")
-        self.files_url = urljoin(client.service_url, "data/api/files/")
-        self.base_earthquake_url = urljoin(
-            client.service_url, "hazard/api/earthquakes/"
-        )
-        self.base_tornado_url = urljoin(client.service_url, "hazard/api/tornadoes/")
+
+        if self.client.internal:
+            self.base_url = urljoin(
+                pyglobals.INCORE_INTERNAL_DATA_API_URL, "data/api/datasets/"
+            )
+            self.base_earthquake_url = urljoin(
+                pyglobals.INCORE_INTERNAL_HAZARD_API_URL, "hazard/api/earthquakes/"
+            )
+            self.base_tornado_url = urljoin(
+                pyglobals.INCORE_INTERNAL_HAZARD_API_URL, "hazard/api/tornadoes/"
+            )
+            self.files_url = urljoin(
+                pyglobals.INCORE_INTERNAL_DATA_API_URL, "data/api/files/"
+            )
+        else:
+            self.base_url = urljoin(client.service_url, "data/api/datasets/")
+            self.base_earthquake_url = urljoin(
+                client.service_url, "hazard/api/earthquakes/"
+            )
+            self.base_tornado_url = urljoin(client.service_url, "hazard/api/tornadoes/")
+            self.files_url = urljoin(client.service_url, "data/api/files/")
 
     @forbid_offline
     def get_dataset_metadata(self, dataset_id: str, timeout=(30, 600), **kwargs):

pyincore/dfr3service.py

@@ -66,7 +66,12 @@ class Dfr3Service:
 
     def __init__(self, client: IncoreClient):
         self.client = client
-        self.base_mapping_url = urljoin(client.service_url, "dfr3/api/mappings/")
+        if self.client.internal:
+            self.base_mapping_url = urljoin(
+                pyglobals.INCORE_INTERNAL_DFR3_API_URL, "dfr3/api/mappings/"
+            )
+        else:
+            self.base_mapping_url = urljoin(client.service_url, "dfr3/api/mappings/")
 
     @forbid_offline
     def get_dfr3_set(self, dfr3_id: str, timeout=(30, 600), **kwargs):

pyincore/fragilityservice.py

@@ -11,6 +11,7 @@
 from pyincore.decorators import forbid_offline
 from pyincore.dfr3service import Dfr3Service
 from pyincore.utils import return_http_response
+import pyincore.globals as pyglobals
 
 
 class FragilityService(Dfr3Service):
@@ -23,9 +24,14 @@ class FragilityService(Dfr3Service):
 
     def __init__(self, client: IncoreClient):
         self.client = client
-        self.base_dfr3_url = urllib.parse.urljoin(
-            client.service_url, "dfr3/api/fragilities/"
-        )
+        if self.client.internal:
+            self.base_dfr3_url = urllib.parse.urljoin(
+                pyglobals.INCORE_INTERNAL_DFR3_API_URL, "dfr3/api/fragilities/"
+            )
+        else:
+            self.base_dfr3_url = urllib.parse.urljoin(
+                client.service_url, "dfr3/api/fragilities/"
+            )
 
         super(FragilityService, self).__init__(client)
 

pyincore/globals.py

@@ -16,6 +16,12 @@
 INCORE_API_DEV_URL = "https://incore-dev.ncsa.illinois.edu"
 
 INCORE_INTERNAL_API_URL = "http://localhost:8080"
+INCORE_INTERNAL_DFR3_API_URL = "http://incore-svc-dfr3:8888"
+INCORE_INTERNAL_DATA_API_URL = "http://incore-svc-data:8888"
+INCORE_INTERNAL_HAZARD_API_URL = "http://incore-svc-hazard:8888"
+INCORE_INTERNAL_SEMANTIC_API_URL = "http://incore-svc-sema:8888"
+INCORE_INTERNAL_SPACE_API_URL = "http://incore-svc-space:8888"
+INCORE_INTERNAL_PROJECT_API_URL = "http://incore-svc-project:8888"
 
 KEYCLOAK_AUTH_PATH = "/auth/realms/In-core/protocol/openid-connect/token"
 KEYCLOAK_USERINFO_PATH = "/auth/realms/In-core/protocol/openid-connect/userinfo"

pyincore/hazardservice.py

@@ -29,16 +29,39 @@ class HazardService:
     def __init__(self, client: IncoreClient):
         self.client = client
 
-        self.base_earthquake_url = urljoin(
-            client.service_url, "hazard/api/earthquakes/"
-        )
-        self.base_tornado_url = urljoin(client.service_url, "hazard/api/tornadoes/")
-        self.base_tsunami_url = urljoin(client.service_url, "hazard/api/tsunamis/")
-        self.base_hurricane_url = urljoin(client.service_url, "hazard/api/hurricanes/")
-        self.base_hurricanewf_url = urljoin(
-            client.service_url, "hazard/api/hurricaneWindfields/"
-        )
-        self.base_flood_url = urljoin(client.service_url, "hazard/api/floods/")
+        if self.client.internal:
+            self.base_earthquake_url = urljoin(
+                pyglobals.INCORE_INTERNAL_HAZARD_API_URL, "hazard/api/earthquakes/"
+            )
+            self.base_tornado_url = urljoin(
+                pyglobals.INCORE_INTERNAL_HAZARD_API_URL, "hazard/api/tornadoes/"
+            )
+            self.base_tsunami_url = urljoin(
+                pyglobals.INCORE_INTERNAL_HAZARD_API_URL, "hazard/api/tsunamis/"
+            )
+            self.base_hurricane_url = urljoin(
+                pyglobals.INCORE_INTERNAL_HAZARD_API_URL, "hazard/api/hurricanes/"
+            )
+            self.base_hurricanewf_url = urljoin(
+                pyglobals.INCORE_INTERNAL_HAZARD_API_URL,
+                "hazard/api/hurricaneWindfields/",
+            )
+            self.base_flood_url = urljoin(
+                pyglobals.INCORE_INTERNAL_HAZARD_API_URL, "hazard/api/floods/"
+            )
+        else:
+            self.base_earthquake_url = urljoin(
+                client.service_url, "hazard/api/earthquakes/"
+            )
+            self.base_tornado_url = urljoin(client.service_url, "hazard/api/tornadoes/")
+            self.base_tsunami_url = urljoin(client.service_url, "hazard/api/tsunamis/")
+            self.base_hurricane_url = urljoin(
+                client.service_url, "hazard/api/hurricanes/"
+            )
+            self.base_hurricanewf_url = urljoin(
+                client.service_url, "hazard/api/hurricaneWindfields/"
+            )
+            self.base_flood_url = urljoin(client.service_url, "hazard/api/floods/")
 
     @forbid_offline
     def get_earthquake_hazard_metadata_list(

pyincore/repairservice.py

@@ -10,6 +10,7 @@
 from pyincore import IncoreClient
 from pyincore.decorators import forbid_offline
 from pyincore.dfr3service import Dfr3Service
+import pyincore.globals as pyglobals
 
 
 class RepairService(Dfr3Service):
@@ -22,9 +23,14 @@ class RepairService(Dfr3Service):
 
     def __init__(self, client: IncoreClient):
         self.client = client
-        self.base_dfr3_url = urllib.parse.urljoin(
-            client.service_url, "dfr3/api/repairs/"
-        )
+        if self.client.internal:
+            self.base_dfr3_url = urllib.parse.urljoin(
+                pyglobals.INCORE_INTERNAL_DFR3_API_URL, "dfr3/api/repairs/"
+            )
+        else:
+            self.base_dfr3_url = urllib.parse.urljoin(
+                client.service_url, "dfr3/api/repairs/"
+            )
 
         super(RepairService, self).__init__(client)
 

pyincore/restorationservice.py

@@ -9,6 +9,7 @@
 from pyincore.decorators import forbid_offline
 from pyincore.dfr3service import Dfr3Service
 from pyincore.utils import return_http_response
+import pyincore.globals as pyglobals
 
 
 class RestorationService(Dfr3Service):
@@ -21,7 +22,12 @@ class RestorationService(Dfr3Service):
 
     def __init__(self, client: IncoreClient):
         self.client = client
-        self.base_dfr3_url = urljoin(client.service_url, "dfr3/api/restorations/")
+        if self.client.internal:
+            self.base_dfr3_url = urljoin(
+                pyglobals.INCORE_INTERNAL_DFR3_API_URL, "dfr3/api/restorations/"
+            )
+        else:
+            self.base_dfr3_url = urljoin(client.service_url, "dfr3/api/restorations/")
 
         super(RestorationService, self).__init__(client)
 

pyincore/semanticservice.py

@@ -29,7 +29,12 @@ class SemanticService:
 
     def __init__(self, client: IncoreClient):
         self.client = client
-        self.base_url = urljoin(client.service_url, "semantics/api/types")
+        if self.client.internal:
+            self.base_url = urljoin(
+                pyglobals.INCORE_INTERNAL_SEMANTIC_API_URL, "semantics/api/types"
+            )
+        else:
+            self.base_url = urljoin(client.service_url, "semantics/api/types")
 
     @forbid_offline
     def get_all_semantic_types(

pyincore/spaceservice.py

@@ -22,7 +22,12 @@ class SpaceService:
 
     def __init__(self, client: IncoreClient):
         self.client = client
-        self.base_space_url = urljoin(client.service_url, "space/api/spaces/")
+        if self.client.internal:
+            self.base_space_url = urljoin(
+                pyglobals.INCORE_INTERNAL_SPACE_API_URL, "space/api/spaces/"
+            )
+        else:
+            self.base_space_url = urljoin(client.service_url, "space/api/spaces/")
 
     @forbid_offline
     def create_space(self, space_json, timeout=(30, 600), **kwargs):