no use to redirect from hf.co/spaces/pup-py/fetch

fetch.py

@@ -1,12 +1,11 @@
 from apscheduler.executors.asyncio import AsyncIOExecutor
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from contextlib import asynccontextmanager
-from datetime import datetime
+from datetime import datetime, timedelta
 from fastapi import FastAPI, Request
 from fastapi.responses import (
     FileResponse,
     PlainTextResponse,
-    RedirectResponse,
     Response,
 )
 from os import environ, getenv
@@ -18,6 +17,10 @@ import json
 import subprocess
 
 LOGFILE = Path.home() / "a.json"
+PUP_URLS = {
+    "Linux": "https://raw.githubusercontent.com/liquidcarbon/puppy/main/pup.sh",
+    "Windows": "https://raw.githubusercontent.com/liquidcarbon/puppy/main/pup.ps1",
+}
 
 
 class PrettyJSONResponse(Response):
@@ -49,21 +52,18 @@ def read_root(request: Request) -> Response:
     """
 
     query_params = dict(request.query_params)
-    if "ping" in query_params:
-        self_host = getenv("SPACE_HOST", "0.0.0.0:7860")
-        return RedirectResponse(f"http://{self_host}/ping")
 
     # python version
     py_ver = query_params.pop("python", "3.12")
     if "Windows" in request.headers.get("user-agent"):
-        pup_url = "https://raw.githubusercontent.com/liquidcarbon/puppy/main/pup.ps1"
+        pup_url = PUP_URLS.get("Windows")
         script = [
             f"$pup_ps1 = (iwr -useb {pup_url}).Content",
             f"& ([scriptblock]::Create($pup_ps1)) {py_ver}",
         ]
         hint = f"""iex (iwr "{request.url}").Content"""
     else:
-        pup_url = "https://raw.githubusercontent.com/liquidcarbon/puppy/main/pup.sh"
+        pup_url = PUP_URLS.get("Linux")
         script = [f"curl -fsSL {pup_url} | bash -s {py_ver}"]
         hint = f"""curl -fsSL "{request.url}" | bash"""
 
@@ -152,17 +152,16 @@ async def ping():
 
 
 def self_ping():
-    # self_host = getenv("SPACE_HOST", "0.0.0.0:7860")
-    self_host = "https://huggingface.co/spaces/pup-py/fetch?ping"
+    self_host1 = getenv("SPACE_HOST", "0.0.0.0:7860")
+    self_host2 = "https://huggingface.co/spaces/pup-py/fetch"
     with httpx.Client() as client:
-        # _ = client.get(f"http://{self_host}/ping", follow_redirects=True)
-        _ = client.get(self_host, follow_redirects=True)
+        _ = client.get(f"http://{self_host1}/ping", follow_redirects=True)
+        _ = client.get(self_host2, follow_redirects=True)
 
 
-self_ping()
-
 scheduler = AsyncIOScheduler(executors={"default": AsyncIOExecutor()})
-scheduler.add_job(self_ping, "interval", minutes=720)
+scheduler.add_job(self_ping, next_run_time=datetime.now() + timedelta(seconds=30))
+scheduler.add_job(self_ping, "interval", minutes=1)
 
 
 if __name__ == "__main__":

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fetch"
-version = "0.5.0"
+version = "0.5.1"
 description = "Puppy Installer"
 authors = [
     { name = "Alex Kislukhin" }