From 0a438dbc28e7e366a1263dd117154b07baa6d1de Mon Sep 17 00:00:00 2001 From: mcdominik Date: Tue, 28 Feb 2023 17:25:25 +0100 Subject: [PATCH 1/4] new structure --- seq-basic-server/basic_server.py | 12 ++++++++++++ seq-basic-server/package.json | 28 ++++++++++++++++++++++++++++ seq-basic-server/requirements.txt | 2 ++ seq-basic-server/run.py | 6 ++++++ 4 files changed, 48 insertions(+) create mode 100644 seq-basic-server/basic_server.py create mode 100644 seq-basic-server/package.json create mode 100644 seq-basic-server/requirements.txt create mode 100644 seq-basic-server/run.py diff --git a/seq-basic-server/basic_server.py b/seq-basic-server/basic_server.py new file mode 100644 index 0000000..3f99f2e --- /dev/null +++ b/seq-basic-server/basic_server.py @@ -0,0 +1,12 @@ +import http.server +import socketserver +import asyncio +from functools import partial + + +async def run(context, input, port=8002): + Handler = partial(http.server.SimpleHTTPRequestHandler, directory='../') + with socketserver.TCPServer(("", port), Handler) as httpd: + print(f"serving at port: {port}") + httpd.serve_forever() + await asyncio.sleep(1) \ No newline at end of file diff --git a/seq-basic-server/package.json b/seq-basic-server/package.json new file mode 100644 index 0000000..40c4946 --- /dev/null +++ b/seq-basic-server/package.json @@ -0,0 +1,28 @@ +{ + "name": "@scramjet/raspberry", + "version": "0.0.1", + "main": "raspberry.py", + "author": "mcdominik", + "license": "GPL-3.0", + "description": "basic python server example", + "keywords": [ + "server", + "python", + "http" + ], + "repository": { + "type": "git", + "url": "https://github.com/scramjetorg/raspberry-pi-dash" + }, + "engines": { + "python3": "3.8.0" + }, + "scripts": { + "build": "mkdir -p dist/__pypackages__/ && pip3 install -t dist/__pypackages__/ -r requirements.txt && cp raspberry.py package.json ./dist/", + "pack" : "si seq pack dist", + "clean": "rm -rf ./dist" + }, + "dependencies": { + "@scramjet/api-client": "0.32.1" + } +} \ No newline at end of file diff --git a/seq-basic-server/requirements.txt b/seq-basic-server/requirements.txt new file mode 100644 index 0000000..4973af7 --- /dev/null +++ b/seq-basic-server/requirements.txt @@ -0,0 +1,2 @@ +scramjet-framework-py==0.10 +pyee==9.0.4 \ No newline at end of file diff --git a/seq-basic-server/run.py b/seq-basic-server/run.py new file mode 100644 index 0000000..39cdd56 --- /dev/null +++ b/seq-basic-server/run.py @@ -0,0 +1,6 @@ +from basic_server import run +import asyncio + + +if __name__ == "__main__": + asyncio.run(run(None, None)) From 4da407316c864ee8efaf59dfd58b2ff158a044a5 Mon Sep 17 00:00:00 2001 From: mcdominik Date: Tue, 28 Feb 2023 17:26:19 +0100 Subject: [PATCH 2/4] new structure --- raspberry-pi/basic_server/basic_server.py | 14 -------------- raspberry-pi/basic_server/run.py | 6 ------ 2 files changed, 20 deletions(-) delete mode 100644 raspberry-pi/basic_server/basic_server.py delete mode 100644 raspberry-pi/basic_server/run.py diff --git a/raspberry-pi/basic_server/basic_server.py b/raspberry-pi/basic_server/basic_server.py deleted file mode 100644 index 993cecc..0000000 --- a/raspberry-pi/basic_server/basic_server.py +++ /dev/null @@ -1,14 +0,0 @@ -import http.server -import socketserver -import asyncio - - -async def run(context, input, port=10000): - Handler = http.server.SimpleHTTPRequestHandler - with socketserver.TCPServer(("", port), Handler) as httpd: - httpd.server_activate() - print("serving at port", port) - while True: - await asyncio.sleep(100) - - diff --git a/raspberry-pi/basic_server/run.py b/raspberry-pi/basic_server/run.py deleted file mode 100644 index 39cdd56..0000000 --- a/raspberry-pi/basic_server/run.py +++ /dev/null @@ -1,6 +0,0 @@ -from basic_server import run -import asyncio - - -if __name__ == "__main__": - asyncio.run(run(None, None)) From d3933528bed872c91df858f6b09bd1d009afd3d0 Mon Sep 17 00:00:00 2001 From: mcdominik Date: Tue, 28 Feb 2023 17:27:24 +0100 Subject: [PATCH 3/4] fix main path --- seq-basic-server/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seq-basic-server/package.json b/seq-basic-server/package.json index 40c4946..b2ddc4a 100644 --- a/seq-basic-server/package.json +++ b/seq-basic-server/package.json @@ -1,7 +1,7 @@ { "name": "@scramjet/raspberry", "version": "0.0.1", - "main": "raspberry.py", + "main": "basic_server.py", "author": "mcdominik", "license": "GPL-3.0", "description": "basic python server example", From 6f337444b6360e3805ca036a6ee5224da86b3381 Mon Sep 17 00:00:00 2001 From: mcdominik Date: Wed, 1 Mar 2023 09:49:40 +0100 Subject: [PATCH 4/4] seq update --- seq-basic-server/basic_server.py | 4 +--- seq-basic-server/package.json | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/seq-basic-server/basic_server.py b/seq-basic-server/basic_server.py index 3f99f2e..b62e42f 100644 --- a/seq-basic-server/basic_server.py +++ b/seq-basic-server/basic_server.py @@ -1,6 +1,5 @@ import http.server import socketserver -import asyncio from functools import partial @@ -8,5 +7,4 @@ async def run(context, input, port=8002): Handler = partial(http.server.SimpleHTTPRequestHandler, directory='../') with socketserver.TCPServer(("", port), Handler) as httpd: print(f"serving at port: {port}") - httpd.serve_forever() - await asyncio.sleep(1) \ No newline at end of file + httpd.serve_forever() \ No newline at end of file diff --git a/seq-basic-server/package.json b/seq-basic-server/package.json index b2ddc4a..58979f0 100644 --- a/seq-basic-server/package.json +++ b/seq-basic-server/package.json @@ -18,7 +18,7 @@ "python3": "3.8.0" }, "scripts": { - "build": "mkdir -p dist/__pypackages__/ && pip3 install -t dist/__pypackages__/ -r requirements.txt && cp raspberry.py package.json ./dist/", + "build": "mkdir -p dist/__pypackages__/ && pip3 install -t dist/__pypackages__/ -r requirements.txt && cp basic_server.py package.json ./dist/", "pack" : "si seq pack dist", "clean": "rm -rf ./dist" },