Spaces:

brianronan
/

netron-docker-diff

Running

App Files Files Community

brian-xetdata commited on Aug 14

Commit

0af0888

•

1 Parent(s): f24e0f7

Adding netron and proxy service code

Browse files

Files changed (6) hide show

.gitignore +3 -0
Dockerfile +1 -1
app.py +35 -23
proxy.py +63 -0
requirements.txt +1 -3
wrapper.sh +1 -1

.gitignore CHANGED Viewed

	@@ -1 +1,4 @@


1	.venv


1	+ __pycache__
2	+
3	.venv
4	+

Dockerfile CHANGED Viewed

@@ -11,4 +11,4 @@ RUN pip install --no-cache-dir --upgrade -r requirements.txt
 COPY --chown=user . /app
-CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "7860"]


11
12	COPY --chown=user . /app
13
14	+ CMD "./wrapper.sh"

app.py CHANGED Viewed

@@ -1,31 +1,43 @@
-from flask import Flask
-from starlette.requests import Request
-from starlette.responses import StreamingResponse
-from starlette.background import BackgroundTask
-import httpx
-client = httpx.AsyncClient(base_url="http://127.0.0.1:8080/")
-async def _reverse_proxy(request: Request):
-    url = httpx.URL(path=request.url.path,
-                    query=request.url.query.encode("utf-8"))
-    rp_req = client.build_request(request.method, url,
-                                  headers=request.headers.raw,
-                                  content=await request.body())
-    rp_resp = await client.send(rp_req, stream=True)
-    return StreamingResponse(
-        rp_resp.aiter_raw(),
-        status_code=rp_resp.status_code,
-        headers=rp_resp.headers,
-        background=BackgroundTask(rp_resp.aclose),
-    )
 app = Flask(__name__)
-app.add_route("/netron", _reverse_proxy, methods=["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS", "HEAD"])
 @app.get("/")
 def base():
-    return "<p>Netron is running</p>"

+from flask import Flask, request, redirect, Response
+import requests
+SITE_NAME ="http://127.0.0.1:8080/"
 app = Flask(__name__)
+@app.route('/netron', methods=['GET'])
+def proxy():
+    global SITE_NAME
+    if request.method=='GET':
+        url = request.args.get('url')
+        forward = f'{SITE_NAME}?url={url}'
+        print(forward)
+        resp = requests.get(forward)
+        excluded_headers = ['content-encoding', 'content-length', 'transfer-encoding', 'connection']
+        headers = [(name, value) for (name, value) in  resp.raw.headers.items() if name.lower() not in excluded_headers]
+        response = Response(resp.content, resp.status_code, headers)
+        return response
 @app.get("/")
 def base():
+    return """
+<html>
+    <head>
+        <title>Netron</title>
+        <script type="text/javascript">
+            function setFile() {
+                console.log("setFile");
+                var url = document.getElementById('url').value;
+                var iframe = document.getElementById('netron');
+                iframe.src = 'http://localhost:7860/?url=' + url;
+            }
+        </script>
+    </head>
+    <body style="padding: 0; margin: 0; display: flex; flex-direction: column; align-items: center;">
+            <input type="text" id="url" value="https://huggingface.co/brianronan/chessbot-test/resolve/main/chessbot.pb" style="width: 100%; height: 30px;"/>
+            <button type="submit" style="width: 100%; height: 30px;" onClick="setFile">Load</button>
+        <iframe id="netron" src="http://localhost:7860/?url=https://huggingface.co/brianronan/chessbot-test/resolve/main/chessbot.pb" style="width: 100%; height: 100%; border: none;"/>
+    </body>
+</html>
+"""

proxy.py ADDED Viewed

	@@ -0,0 +1,63 @@

+import os
+#
+from flask import Flask, request, Response
+import requests  # pip package requests
+app = Flask(__name__)
+API_HOST = "http://127.0.0.1:8080/"
+# @app.route('/', defaults={'path': ''}, methods=["GET", "POST"])  # ref. https://medium.com/@zwork101/making-a-flask-proxy-server-online-in-10-lines-of-code-44b8721bca6
+@app.route('/<path>', methods=["GET", "POST"])  # NOTE: better to specify which methods to be accepted. Otherwise, only GET will be accepted. Ref: https://flask.palletsprojects.com/en/3.0.x/quickstart/#http-methods
+def redirect_to_API_HOST(path):  #NOTE var :path will be unused as all path we need will be read from :request ie from flask import request
+    forward = ''
+    if path == 'netron':
+        url = request.args.get('url')
+        forward = f'{API_HOST}/?url={url}'
+    else:
+        forward = request.url.replace(request.host_url, f'{API_HOST}/')
+    res = requests.request(  # ref. https://stackoverflow.com/a/36601467/248616
+        method          = request.method,
+        url             = forward,
+        headers         = {k:v for k,v in request.headers if k.lower() != 'host'}, # exclude 'host' header
+        data            = request.get_data(),
+        cookies         = request.cookies,
+        allow_redirects = False,
+    )
+    #region exlcude some keys in :res response
+    excluded_headers = ['content-encoding', 'content-length', 'transfer-encoding', 'connection']  #NOTE we here exclude all "hop-by-hop headers" defined by RFC 2616 section 13.5.1 ref. https://www.rfc-editor.org/rfc/rfc2616#section-13.5.1
+    headers          = [
+        (k,v) for k,v in res.raw.headers.items()
+        if k.lower() not in excluded_headers
+    ]
+    #endregion exlcude some keys in :res response
+    response = Response(res.content, res.status_code, headers)
+    return response
+@app.get("/")
+def chooser():
+    return """
+<html>
+    <head>
+        <title>Netron</title>
+        <script type="text/javascript">
+            function setFile() {
+                var url = document.getElementById('url').value;
+                var iframe = document.getElementById('netron');
+                iframe.src = '/netron?url=' + url;
+            }
+        </script>
+    </head>
+    <body style="padding: 0; margin: 0; display: flex; flex-direction: column; align-items: center;">
+        <div style="width: 100%; display: flex; flex-direction: row; justify-content: space-between;">
+            <input type="text" id="url" value="https://huggingface.co/brianronan/chessbot-test/resolve/main/chessbot.pb" style="width: calc(100% - 100px); height: 30px;"/>
+            <button type="submit" style="height: 30px; width: 100px;" onClick="setFile">Load</button>
+        </div>
+        <iframe id="netron" src="/netron?url=https://huggingface.co/brianronan/chessbot-test/resolve/main/chessbot.pb" style="width: 100%; height: 95%; border: none;"/>
+    </body>
+</html>
+"""

requirements.txt CHANGED Viewed

@@ -1,5 +1,3 @@
-fastapi
-uvicorn[standard]
 flask
-httpx
 netron

 flask
 netron
+requests

wrapper.sh CHANGED Viewed

@@ -4,7 +4,7 @@
 netron &
 # Start the the web app
-uvicorn app:app --host 0.0.0.0 --port 7860 &
 wait -n

 netron &
 # Start the the web app
+flask --app proxy run --host 0.0.0.0 --port 7860 &
 wait -n