From 115e402b0d134d48c07d8acd2f18e267592330a7 Mon Sep 17 00:00:00 2001
From: tiijay <git@th-jahn.de>
Date: Fri, 21 Nov 2025 19:07:41 +0000
Subject: [PATCH] v.0.11.3 api-server public port 8000

---
 api-server/.devcontainer/devcontainer.json  |  9 +++++----
 api-server/app/main.py                      | 14 +++++++-------
 pico-client/.devcontainer/devcontainer.json |  5 +++--
 pico-client/main.py                         |  6 +++---
 pico-client/tryout/api_server_checker.py    | 12 +++++++++---
 5 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/api-server/.devcontainer/devcontainer.json b/api-server/.devcontainer/devcontainer.json
index f543eb4..ca6b9ba 100644
--- a/api-server/.devcontainer/devcontainer.json
+++ b/api-server/.devcontainer/devcontainer.json
@@ -7,8 +7,9 @@
 		"dockerfile": "Dockerfile"
 	},
 	"runArgs": [
-		"--network=dev-network",
-		"--name=api-server"
+		// "--network=dev-network",
+		"--name=api-server",
+		"-p", "8000:8000"
   	],
 	// "image": "mcr.microsoft.com/devcontainers/python:1-3.12",
 	// "image": "python:latest",
@@ -31,11 +32,11 @@
 		}
 	},
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [9000],
+	"forwardPorts": [8000],
 	// Use 'portsAttributes' to set default properties for specific forwarded ports. 
 	// More info: https://containers.dev/implementors/json_reference/#port-attributes
 	"portsAttributes": {
-		"9000": {
+		"8000": {
 			"label": "API-Server Application",
 			"onAutoForward": "notify"
 		}
diff --git a/api-server/app/main.py b/api-server/app/main.py
index 22db127..1ddc5d9 100644
--- a/api-server/app/main.py
+++ b/api-server/app/main.py
@@ -7,13 +7,13 @@ from app.models import Item, dummy_items
 app = FastAPI(title="FastAPI Server", version="1.0.0")
 
 # CORS middleware to allow client requests
-# app.add_middleware(
-#     CORSMiddleware,
-#     # allow_origins=["http://localhost:3000", "http://client:3000"],
-#     allow_credentials=True,
-#     allow_methods=["*"],
-#     allow_headers=["*"],
-# )
+app.add_middleware(
+    CORSMiddleware,
+    # allow_origins=["http://localhost:3000", "http://client:3000"],
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
 
 
 @app.get("/")
diff --git a/pico-client/.devcontainer/devcontainer.json b/pico-client/.devcontainer/devcontainer.json
index f765fd2..0ac5065 100644
--- a/pico-client/.devcontainer/devcontainer.json
+++ b/pico-client/.devcontainer/devcontainer.json
@@ -7,8 +7,9 @@
 		"dockerfile": "Dockerfile"
 	},
 	"runArgs": [
-		"--network=dev-network",
-		"--name=pico-client"
+		// "--network=dev-network",
+		"--name=pico-client",
+		"--add-host", "j-agent-01:192.168.178.105"
   	],
 	// "image": "mcr.microsoft.com/devcontainers/python:1-3.12",
 	// "image": "python:latest",
diff --git a/pico-client/main.py b/pico-client/main.py
index 37ce32f..d830fed 100644
--- a/pico-client/main.py
+++ b/pico-client/main.py
@@ -54,10 +54,10 @@ async def main(
 ) -> None:
     # Run both tasks concurrently
     await asyncio.gather(
-        sync_ntp_time_task(),
-        weather_check_task(weather_checker),
+        # sync_ntp_time_task(),
+        # weather_check_task(weather_checker),
         api_server_check_task(api_server_checker),
-        print_time_task(),
+        # print_time_task(),
     )
 
 
diff --git a/pico-client/tryout/api_server_checker.py b/pico-client/tryout/api_server_checker.py
index d34aac1..0bdb7e5 100644
--- a/pico-client/tryout/api_server_checker.py
+++ b/pico-client/tryout/api_server_checker.py
@@ -1,7 +1,9 @@
 import urequests  # type: ignore
 import json
 
-BASE_API_URL: str = "http://api-server:8000"
+# BASE_API_URL: str = "http://api-server:8000"
+# BASE_API_URL: str = "http://j-agent-01:8000"
+BASE_API_URL: str = "http://192.168.178.105:8000"
 
 
 class API_Server_Checker:
@@ -16,6 +18,7 @@ class API_Server_Checker:
         )
         print(f"query: {items_url}")
 
+        r: any
         try:
             r = urequests.get(items_url)
             print("Status-Code:", r.status_code)
@@ -26,9 +29,12 @@ class API_Server_Checker:
             else:
                 print("api-server error:", json_resp["error"]["message"])
         except OSError as e:
-            print(f"api-server call failed: {e}")
+            print("Network error:", e)
+        except Exception as e:
+            print("Error:", e)
         finally:
-            r.close()
+            if r:
+                r.close()
 
     def check(self, item_id: int):
         self._get_items(item_id)