bagaseptian commited on
Commit
a406c08
·
1 Parent(s): 787ee13

after debug

Browse files
Files changed (2) hide show
  1. README.md +1 -1
  2. app.py +51 -35
README.md CHANGED
@@ -4,7 +4,7 @@ emoji: 🚀
4
  colorFrom: yellow
5
  colorTo: red
6
  sdk: docker
7
- app-port: 8000
8
  pinned: false
9
  license: apache-2.0
10
  short_description: lab for education
 
4
  colorFrom: yellow
5
  colorTo: red
6
  sdk: docker
7
+ app_port: 8000
8
  pinned: false
9
  license: apache-2.0
10
  short_description: lab for education
app.py CHANGED
@@ -1,42 +1,49 @@
1
  import os
2
- import httpx #library HTTP client modern, async-friendly
3
  import asyncio
4
  from fastapi import FastAPI, Request, HTTPException
5
  from fastapi.responses import StreamingResponse, RedirectResponse, PlainTextResponse
6
  from fastapi.middleware.cors import CORSMiddleware
7
- from dotenv import load_dotenv #.env
8
  import logging
9
  import time
10
 
11
- # --- Konfigurasi logging ---
12
  logging.basicConfig(level=logging.INFO)
13
  logger = logging.getLogger(__name__)
14
 
15
- # --- konfigurasi aplikasi ---
16
- load_dotenv()
17
 
18
- #url backend RAW github
19
- GITHUB_URL_FILE = os.getenv(
 
20
  "GITHUB_RAW_URL_FILE",
21
  "https://raw.githubusercontent.com/BagaSept26/education-lab/refs/heads/main/backend_url.txt"
22
  )
 
 
 
23
 
24
- #interval cache untuk URL backend
25
- BACKEND_URL_CACHE_TTL = int(os.getenv("BACK_END_URL_CACHE_TTL", "60"))
26
 
27
  # --- State Aplikasi ---
28
- app = FastAPI(title="Education Lab Redirector", version="0.1.0")
29
  current_backend_url = None
30
  last_url_fetch_time = 0
31
  url_fetch_lock = asyncio.Lock()
32
 
33
- #CORS
 
 
34
  origins = [
35
- "http://localhost:5173", #dev lokal
36
- "https://education-lab-bagaseptian.vercel.app" #vercel pribadi
37
- "https://*/vercel.app" #umum
38
- "https://huggingface.co/spaces/bagaseptian/edu_lab" #hf space
39
  ]
 
40
  app.add_middleware(
41
  CORSMiddleware,
42
  allow_origins=origins,
@@ -46,23 +53,27 @@ app.add_middleware(
46
  )
47
 
48
  async def get_latest_backend_url_from_github():
49
- """Mengambil URL backend terbaru dari file gihub"""
50
  global current_backend_url, last_url_fetch_time
51
 
52
- async with url_fetch_lock:
 
53
  if current_backend_url and (time.time() - last_url_fetch_time) < BACKEND_URL_CACHE_TTL:
54
- logger.info(f"Menggunakan URL Backend dari cache: {current_backend_url}")
55
  return current_backend_url
56
-
57
- logger.info(f"Mengambil URL backend terbaru dari Github: {GITHUB_URL_FILE}")
58
  headers = {}
 
 
 
59
  try:
60
  async with httpx.AsyncClient(timeout=10.0) as client:
61
  response = await client.get(GITHUB_RAW_URL_FILE, headers=headers)
62
- response.raise_for_status()
63
-
64
  new_url = response.text.strip()
65
- if new_url and (new_url.startswith("http://") or new_url.startswith("https;//")):
66
  if new_url != current_backend_url:
67
  logger.info(f"URL backend baru ditemukan: {new_url}")
68
  current_backend_url = new_url
@@ -71,23 +82,27 @@ async def get_latest_backend_url_from_github():
71
  last_url_fetch_time = time.time()
72
  return current_backend_url
73
  else:
74
- logger.error(f"Format URL tidak valid dari Github: '{new_url}'")
75
- return current_backend_url
 
76
  except httpx.HTTPStatusError as e:
77
- logger.error(f"HTTP error saat mengambil URL dari Github: {e.response.status_code} - {e.response.text}")
78
  except httpx.RequestError as e:
79
- logger.error(f"Request error saat mengambil URL dari Github: {e}")
80
  except Exception as e:
81
  logger.error(f"Error tidak terduga saat mengambil URL: {e}")
82
-
83
- if current_backend_url and (time.time() - last_url_fetch_time) < (BACKEND_URL_CACHE_TTL * 5):
84
- logger.warning("Gagal megambil URL baru, menggunakan URL lama dari cache.")
 
 
85
  return current_backend_url
86
- else:
87
- current_backend_url = None
88
  last_url_fetch_time = 0
89
  return None
90
 
 
91
  @app.api_route("/{path:path}", methods=["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS", "HEAD"])
92
  async def proxy_to_backend(request: Request, path: str):
93
  """
@@ -178,9 +193,10 @@ async def status():
178
  "last_url_fetch_attempt_timestamp": last_url_fetch_time if last_url_fetch_time > 0 else "Belum pernah fetch"
179
  }
180
 
181
-
182
  # if __name__ == "__main__":
183
  # import uvicorn
184
- # logger.info("Menjalankan redirector lokal di port 8001...")
185
-
 
186
  # uvicorn.run(app, host="0.0.0.0", port=8001)
 
1
  import os
2
+ import httpx # Library HTTP client modern, async-friendly
3
  import asyncio
4
  from fastapi import FastAPI, Request, HTTPException
5
  from fastapi.responses import StreamingResponse, RedirectResponse, PlainTextResponse
6
  from fastapi.middleware.cors import CORSMiddleware
7
+ from dotenv import load_dotenv # Untuk membaca .env jika perlu (opsional)
8
  import logging
9
  import time
10
 
11
+ # --- Konfigurasi Logging ---
12
  logging.basicConfig(level=logging.INFO)
13
  logger = logging.getLogger(__name__)
14
 
15
+ # --- Konfigurasi Aplikasi ---
16
+ load_dotenv() # Muat variabel dari .env jika ada (untuk pengembangan lokal)
17
 
18
+ # URL ke file backend_url.txt RAW di GitHub
19
+ # Ganti YOUR_GITHUB_USERNAME dan YOUR_REPO_NAME
20
+ GITHUB_RAW_URL_FILE = os.getenv(
21
  "GITHUB_RAW_URL_FILE",
22
  "https://raw.githubusercontent.com/BagaSept26/education-lab/refs/heads/main/backend_url.txt"
23
  )
24
+ # Token GitHub PAT jika repo Anda private (tidak direkomendasikan untuk file URL ini)
25
+ # Jika repo publik, token tidak diperlukan untuk membaca file raw.
26
+ # GITHUB_TOKEN = os.getenv("GITHUB_PAT_FOR_REDIRECTOR") # Simpan di Secrets HF Space
27
 
28
+ # Interval cache untuk URL backend (dalam detik)
29
+ BACKEND_URL_CACHE_TTL = int(os.getenv("BACKEND_URL_CACHE_TTL", "60")) # Cache 60 detik
30
 
31
  # --- State Aplikasi ---
32
+ app = FastAPI(title="Edication Lab Redirector", version="0.1.0")
33
  current_backend_url = None
34
  last_url_fetch_time = 0
35
  url_fetch_lock = asyncio.Lock()
36
 
37
+ # --- Konfigurasi CORS untuk HF Space ---
38
+ # Izinkan request dari Vercel frontend Anda
39
+ # Ganti dengan URL Vercel Anda yang sebenarnya atau gunakan wildcard yang lebih spesifik
40
  origins = [
41
+ "http://localhost:5173", # Untuk dev lokal frontend
42
+ "https://education-lab-bagaseptian.vercel.app", # GANTI INI
43
+ "https://*.vercel.app", # Lebih umum
44
+ "https://bagaseptian-edu_lab.hf.space" # URL space ini sendiri jika perlu
45
  ]
46
+
47
  app.add_middleware(
48
  CORSMiddleware,
49
  allow_origins=origins,
 
53
  )
54
 
55
  async def get_latest_backend_url_from_github():
56
+ """Mengambil URL backend terbaru dari file di GitHub."""
57
  global current_backend_url, last_url_fetch_time
58
 
59
+ async with url_fetch_lock: # Pastikan hanya satu coroutine yang fetch pada satu waktu
60
+ # Cek apakah cache masih valid
61
  if current_backend_url and (time.time() - last_url_fetch_time) < BACKEND_URL_CACHE_TTL:
62
+ logger.info(f"Menggunakan URL backend dari cache: {current_backend_url}")
63
  return current_backend_url
64
+
65
+ logger.info(f"Mengambil URL backend terbaru dari GitHub: {GITHUB_RAW_URL_FILE}")
66
  headers = {}
67
+ # if GITHUB_TOKEN: # Jika file di repo private
68
+ # headers["Authorization"] = f"token {GITHUB_TOKEN}"
69
+
70
  try:
71
  async with httpx.AsyncClient(timeout=10.0) as client:
72
  response = await client.get(GITHUB_RAW_URL_FILE, headers=headers)
73
+ response.raise_for_status() # Akan raise error untuk status 4xx/5xx
74
+
75
  new_url = response.text.strip()
76
+ if new_url and (new_url.startswith("http://") or new_url.startswith("https://")):
77
  if new_url != current_backend_url:
78
  logger.info(f"URL backend baru ditemukan: {new_url}")
79
  current_backend_url = new_url
 
82
  last_url_fetch_time = time.time()
83
  return current_backend_url
84
  else:
85
+ logger.error(f"Format URL tidak valid dari GitHub: '{new_url}'")
86
+ # Jangan update cache jika URL tidak valid, tetap gunakan yang lama (jika ada)
87
+ return current_backend_url # Atau None jika belum pernah ada yg valid
88
  except httpx.HTTPStatusError as e:
89
+ logger.error(f"HTTP error saat mengambil URL dari GitHub: {e.response.status_code} - {e.response.text}")
90
  except httpx.RequestError as e:
91
+ logger.error(f"Request error saat mengambil URL dari GitHub: {e}")
92
  except Exception as e:
93
  logger.error(f"Error tidak terduga saat mengambil URL: {e}")
94
+
95
+ # Jika fetch gagal, kembalikan URL lama yang valid (jika ada) untuk sementara waktu
96
+ # atau jika URL lama sudah terlalu lama, mungkin lebih baik return None
97
+ if current_backend_url and (time.time() - last_url_fetch_time) < (BACKEND_URL_CACHE_TTL * 5): # Toleransi 5x TTL
98
+ logger.warning("Gagal mengambil URL baru, menggunakan URL lama dari cache.")
99
  return current_backend_url
100
+ else: # Jika URL lama juga sudah terlalu basi atau tidak ada
101
+ current_backend_url = None # Reset jika gagal fetch terlalu lama
102
  last_url_fetch_time = 0
103
  return None
104
 
105
+
106
  @app.api_route("/{path:path}", methods=["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS", "HEAD"])
107
  async def proxy_to_backend(request: Request, path: str):
108
  """
 
193
  "last_url_fetch_attempt_timestamp": last_url_fetch_time if last_url_fetch_time > 0 else "Belum pernah fetch"
194
  }
195
 
196
+ # Jika dijalankan secara lokal (python app.py)
197
  # if __name__ == "__main__":
198
  # import uvicorn
199
+ # logger.info("Menjalankan redirector secara lokal di port 8001...")
200
+ # # Ganti nilai di GITHUB_RAW_URL_FILE dengan URL raw GitHub Anda yang benar sebelum menjalankan lokal
201
+ # # Contoh: GITHUB_RAW_URL_FILE = "https://raw.githubusercontent.com/NAMA_USER_ANDA/edication-lab/main/backend_url.txt"
202
  # uvicorn.run(app, host="0.0.0.0", port=8001)