From f0a1eb6e1bde2cbb873eda57318648aa3dab917e Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 16 Jun 2023 15:57:49 +0800 Subject: [PATCH 001/164] change input --- app/__init__.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index c8f3a7d..014d987 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -10,20 +10,14 @@ @app.route('/test', methods=['GET']) def getResult(): - input = np.array([[5.5, 2.4, 2.7, 1.]]) - result = model.predict(input) + result = 1 return jsonify({'result': str(result)}) @app.route('/predict', methods=['POST']) def postInput(): # 取得前端傳過來的數值 insertValues = request.get_json() - x1=insertValues['sepalLengthCm'] - x2=insertValues['sepalWidthCm'] - x3=insertValues['petalLengthCm'] - x4=insertValues['petalWidthCm'] - input = np.array([[x1, x2, x3, x4]]) + x1=insertValues['userID'] # 進行預測 - result = model.predict(input) - + result = x1+1 return jsonify({'result': str(result)}) \ No newline at end of file From 16052cd0aefdaf70107a63c245d1a0fa98e22363 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 16 Jun 2023 16:13:24 +0800 Subject: [PATCH 002/164] delete some doc --- README.md | 17 +---------------- requirements.txt | 2 -- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/README.md b/README.md index 3052507..3b12464 100644 --- a/README.md +++ b/README.md @@ -1,16 +1 @@ -# Heroku 部署機器學習 API -此範例使用鳶尾花朵資料集進行 `XGBoost` 分類器模型訓練。將模型儲存起來，並使用 Flask 建置 API 介面提供輸入值預測。最後並部署到 Heroku 雲端伺服器平台。 - -## Getting Started -### Fork Project -你可以直接 Fork 此專案到你自己的 GitHub 帳號中，並採用 Heroku 連動 GitHub 專案的方式部署此 API 範例。 - -### Fork 專案到自己的 GitHub 帳號中 - -![](https://i.imgur.com/CEURaEi.png) - -### 建立一個 Heroku 帳號並新增一個專案 - -[傳送門](https://dashboard.heroku.com/apps) - -![](https://i.imgur.com/QYjg4JR.png) \ No newline at end of file +TEST \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 5f1a947..9b0a6fe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,5 +2,3 @@ Flask Flask-Cors gunicorn numpy -scikit-learn==0.24.2 -xgboost==0.90 \ No newline at end of file From de368837bb17a539f9f46d9e446748da39fd3315 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 16 Jun 2023 16:16:25 +0800 Subject: [PATCH 003/164] delete some doc --- app/model/xgboost-iris.pgz | Bin 19068 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/model/xgboost-iris.pgz diff --git a/app/model/xgboost-iris.pgz b/app/model/xgboost-iris.pgz deleted file mode 100644 index 886cb7515d03cd2c1d2551fc1fc7cd37c66a0570..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19068 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 Date: Fri, 16 Jun 2023 18:03:28 +0800 Subject: [PATCH 004/164] Update __init__.py --- app/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 014d987..1c46f00 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,5 +1,4 @@ # -*- coding: UTF-8 -*- -import app.model as model import numpy as np from flask import Flask, request, jsonify @@ -20,4 +19,4 @@ def postInput(): x1=insertValues['userID'] # 進行預測 result = x1+1 - return jsonify({'result': str(result)}) \ No newline at end of file + return jsonify({'result': str(result)}) From c2927a3175e66ec9da27e5e6054689c523f4c4de Mon Sep 17 00:00:00 2001 From: jack80806 <56598771+jack80806@users.noreply.github.com> Date: Fri, 16 Jun 2023 18:04:18 +0800 Subject: [PATCH 005/164] Update model.py --- app/model.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/model.py b/app/model.py index b7c6f93..8b13789 100644 --- a/app/model.py +++ b/app/model.py @@ -1,13 +1 @@ -# -*- coding: UTF-8 -*- -import pickle -import gzip -# 載入Model -with gzip.open('app/model/xgboost-iris.pgz', 'r') as f: - xgboostModel = pickle.load(f) - - -def predict(input): - pred=xgboostModel.predict(input)[0] - print(pred) - return pred \ No newline at end of file From b458bf0d8aa0d8d5fad98759b3fef225e7658cea Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 16 Jun 2023 20:51:55 +0800 Subject: [PATCH 006/164] result --- app/__init__.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 014d987..f751f7b 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -10,7 +10,15 @@ @app.route('/test', methods=['GET']) def getResult(): - result = 1 + result = '[ + { + "id": "Ace", + "family history": "心臟病, 高血壓, 糖尿病", + "weight": "60", + "age": "22", + "height": "170" + } + ]' return jsonify({'result': str(result)}) @app.route('/predict', methods=['POST']) From 6041b7ad65acdb18d7f7c7870009b9c8908563e0 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 16 Jun 2023 21:14:12 +0800 Subject: [PATCH 007/164] result --- app/__init__.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 73613f8..51b9010 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -1,6 +1,5 @@ # -*- coding: UTF-8 -*- import numpy as np - from flask import Flask, request, jsonify from flask_cors import CORS @@ -9,16 +8,9 @@ @app.route('/test', methods=['GET']) def getResult(): - result = '[ - { - "id": "Ace", - "family history": "心臟病, 高血壓, 糖尿病", - "weight": "60", - "age": "22", - "height": "170" - } - ]' - return jsonify({'result': str(result)}) + result = {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"} + + return jsonify(result) @app.route('/predict', methods=['POST']) def postInput(): @@ -26,5 +18,5 @@ def postInput(): insertValues = request.get_json() x1=insertValues['userID'] # 進行預測 - result = x1+1 + result = '我起床的時候頭暈' return jsonify({'result': str(result)}) From e26370739bcdb1c838ee8a3afd2ffe1f98031c16 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 16 Jun 2023 21:50:51 +0800 Subject: [PATCH 008/164] config --- app/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/__init__.py b/app/__init__.py index 51b9010..e09bc5c 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -8,6 +8,7 @@ @app.route('/test', methods=['GET']) def getResult(): + result = {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"} return jsonify(result) From 4a5f5b054d9bcdbfe9fa83e6136444fb12493e0d Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 16 Jun 2023 21:51:23 +0800 Subject: [PATCH 009/164] config --- config.ini | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 config.ini diff --git a/config.ini b/config.ini new file mode 100644 index 0000000..3b56eec --- /dev/null +++ b/config.ini @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +app.config['JSON_AS_ASCII'] = False \ No newline at end of file From 9f53903e38442c1fb086a2537451e48da47d89d2 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 16 Jun 2023 21:57:43 +0800 Subject: [PATCH 010/164] post string --- app/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index e09bc5c..ae80e58 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -8,7 +8,7 @@ @app.route('/test', methods=['GET']) def getResult(): - + result = {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"} return jsonify(result) @@ -19,5 +19,5 @@ def postInput(): insertValues = request.get_json() x1=insertValues['userID'] # 進行預測 - result = '我起床的時候頭暈' + result = 4 return jsonify({'result': str(result)}) From c110dbb6661a57e5607fabe8b34384e52f39862c Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 16 Jun 2023 22:06:43 +0800 Subject: [PATCH 011/164] new flag --- app/__init__.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index ae80e58..31a0934 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -13,11 +13,22 @@ def getResult(): return jsonify(result) -@app.route('/predict', methods=['POST']) +@app.route('/right', methods=['POST']) def postInput(): # 取得前端傳過來的數值 insertValues = request.get_json() x1=insertValues['userID'] # 進行預測 - result = 4 - return jsonify({'result': str(result)}) + result = 1 + text = "我今天頭很痛" # LINE API 症狀 + return jsonify({'result': str(result), 'text': str(text)}) + +@app.route('/wrong', methods=['POST']) +def postInput(): + # 取得前端傳過來的數值 + insertValues = request.get_json() + x1=insertValues['userID'] + # 進行預測 + result = 2 + text = "我今天頭很痛" # LINE API 症狀 + return jsonify({'result': str(result), 'text': str(text)}) \ No newline at end of file From 0448e88e22855fe5e442fc3c6df5a541c41dae21 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 16 Jun 2023 22:11:04 +0800 Subject: [PATCH 012/164] test jsonify --- app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 31a0934..e6853ce 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -31,4 +31,4 @@ def postInput(): # 進行預測 result = 2 text = "我今天頭很痛" # LINE API 症狀 - return jsonify({'result': str(result), 'text': str(text)}) \ No newline at end of file + return jsonify({'result': str(result)}) \ No newline at end of file From 1cb73e217f3f7c88e047e7d75c3c571b13b9f082 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 16 Jun 2023 22:12:14 +0800 Subject: [PATCH 013/164] test json 2 --- app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index e6853ce..8a3ef14 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -21,7 +21,7 @@ def postInput(): # 進行預測 result = 1 text = "我今天頭很痛" # LINE API 症狀 - return jsonify({'result': str(result), 'text': str(text)}) + return jsonify({'result': str(result)}) @app.route('/wrong', methods=['POST']) def postInput(): From 641fb53474e2fbf983bc94c53a0573f05fbfc3a5 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 16 Jun 2023 22:13:17 +0800 Subject: [PATCH 014/164] test func --- app/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 8a3ef14..f5aa7db 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -21,10 +21,10 @@ def postInput(): # 進行預測 result = 1 text = "我今天頭很痛" # LINE API 症狀 - return jsonify({'result': str(result)}) + return jsonify({'result': str(result), 'text': str(text)}) @app.route('/wrong', methods=['POST']) -def postInput(): +def postInput2(): # 取得前端傳過來的數值 insertValues = request.get_json() x1=insertValues['userID'] From 43181b5ef1987fe9d53aa2c261bb5888fdc7585a Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 16 Jun 2023 22:14:04 +0800 Subject: [PATCH 015/164] just one post --- app/__init__.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index f5aa7db..dd1b5a0 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -22,13 +22,3 @@ def postInput(): result = 1 text = "我今天頭很痛" # LINE API 症狀 return jsonify({'result': str(result), 'text': str(text)}) - -@app.route('/wrong', methods=['POST']) -def postInput2(): - # 取得前端傳過來的數值 - insertValues = request.get_json() - x1=insertValues['userID'] - # 進行預測 - result = 2 - text = "我今天頭很痛" # LINE API 症狀 - return jsonify({'result': str(result)}) \ No newline at end of file From e7d766c9289f5299a2c3870f4eb306b12165fb40 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 16 Jun 2023 22:55:25 +0800 Subject: [PATCH 016/164] result --- app/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index dd1b5a0..1f7caa8 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -9,9 +9,9 @@ @app.route('/test', methods=['GET']) def getResult(): - result = {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"} - - return jsonify(result) + #result = {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"} + result = 1 + return jsonify(str(result)) @app.route('/right', methods=['POST']) def postInput(): From 082a6ba8ac3f14da3a34791e0bc18872d3a83e80 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 16 Jun 2023 22:59:14 +0800 Subject: [PATCH 017/164] result =1 --- app/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 1f7caa8..69e6127 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -9,9 +9,9 @@ @app.route('/test', methods=['GET']) def getResult(): - #result = {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"} + #['Ace': {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"}] result = 1 - return jsonify(str(result)) + return jsonify('result':str(result)) @app.route('/right', methods=['POST']) def postInput(): From a71f8e32c4ee3e006c0a0d8c2b387b3b8fdacd90 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 16 Jun 2023 23:02:45 +0800 Subject: [PATCH 018/164] {} --- app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 69e6127..926e5e7 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -11,7 +11,7 @@ def getResult(): #['Ace': {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"}] result = 1 - return jsonify('result':str(result)) + return jsonify({'result':str(result)}) @app.route('/right', methods=['POST']) def postInput(): From 230148b51c135e3e87738e28562e5ac8c6f1aa90 Mon Sep 17 00:00:00 2001 From: jack80806 <56598771+jack80806@users.noreply.github.com> Date: Fri, 16 Jun 2023 23:19:32 +0800 Subject: [PATCH 019/164] Update __init__.py --- app/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 69e6127..57acc2f 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -8,10 +8,10 @@ @app.route('/test', methods=['GET']) def getResult(): - + #['Ace': {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"}] - result = 1 - return jsonify('result':str(result)) + result = {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"} + return jsonify(result) @app.route('/right', methods=['POST']) def postInput(): From 5e83835e7b94f572b6d2f76db59fcf47b682806f Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 16 Jun 2023 23:38:15 +0800 Subject: [PATCH 020/164] new test2 --- app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index fe3dde2..b8e75ac 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -28,4 +28,4 @@ def getResult2(): #['Ace': {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"}] result = 1 - return jsonify('result': str(result)) \ No newline at end of file + return jsonify({'result': str(result)}) \ No newline at end of file From 348cfc70d0f5da6698ee49e01bb091d882e877a2 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sat, 17 Jun 2023 03:08:42 +0800 Subject: [PATCH 021/164] forTest3 --- app/__init__.py | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index b8e75ac..b1a9092 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -6,8 +6,8 @@ app = Flask(__name__) CORS(app) -@app.route('/test', methods=['GET']) -def getResult(): +@app.route('/userInfo', methods=['GET']) +def getUserInfo(): #['Ace': {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"}] result = {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"} @@ -28,4 +28,21 @@ def getResult2(): #['Ace': {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"}] result = 1 - return jsonify({'result': str(result)}) \ No newline at end of file + return jsonify({'result': str(result)}) + +@app.route('/test3', methods=['GET']) +def getResult3(): + + #['Ace': {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"}] + result = { + "result": [ + { + "id": "Ace", + "family history": "心臟病, 高血壓, 糖尿病", + "weight": "60", + "age": "22", + "height": "170" + } + ] +} + return jsonify(result) \ No newline at end of file From dd9c916be2e3819c4265f5f3e78dfb54eda1a645 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sat, 17 Jun 2023 03:35:26 +0800 Subject: [PATCH 022/164] basicInfo&message --- app/__init__.py | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index b1a9092..d96def9 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -6,8 +6,44 @@ app = Flask(__name__) CORS(app) -@app.route('/userInfo', methods=['GET']) -def getUserInfo(): +@app.route('/basicInfo', methods=['POST']) +def postForBasicInfo(): + # 取得前端傳過來的數值 + insertValues = request.get_json() + x1=insertValues['userID'] + flag = 1 + result = { + "flag": flag, + "result": + { + "family history": "心臟病, 高血壓, 糖尿病", + "weight": "60", + "age": "22", + "height": "170" + } + +} # LINE API + return jsonify(result) + +@app.route('/message', methods=['POST']) +def postForMessage(): + insertValues = request.get_json() + x1=insertValues['userID'] + flag = 1 + message = "我今天頭很痛" # LINE API 症狀 + result = + { + "flag": flag, + "result": + { + "message": message + } + } + return jsonify(result) + + +@app.route('/test', methods=['GET']) +def test(): #['Ace': {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"}] result = {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"} @@ -15,10 +51,8 @@ def getUserInfo(): @app.route('/right', methods=['POST']) def postInput(): - # 取得前端傳過來的數值 insertValues = request.get_json() x1=insertValues['userID'] - # 進行預測 result = 1 text = "我今天頭很痛" # LINE API 症狀 return jsonify({'result': str(result), 'text': str(text)}) From 382f1d2bfa1413f323c982b7600c1f6dbdf5b7a2 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sat, 17 Jun 2023 03:41:40 +0800 Subject: [PATCH 023/164] testForFlag --- app/__init__.py | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index d96def9..f968b1b 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -6,40 +6,7 @@ app = Flask(__name__) CORS(app) -@app.route('/basicInfo', methods=['POST']) -def postForBasicInfo(): - # 取得前端傳過來的數值 - insertValues = request.get_json() - x1=insertValues['userID'] - flag = 1 - result = { - "flag": flag, - "result": - { - "family history": "心臟病, 高血壓, 糖尿病", - "weight": "60", - "age": "22", - "height": "170" - } - -} # LINE API - return jsonify(result) -@app.route('/message', methods=['POST']) -def postForMessage(): - insertValues = request.get_json() - x1=insertValues['userID'] - flag = 1 - message = "我今天頭很痛" # LINE API 症狀 - result = - { - "flag": flag, - "result": - { - "message": message - } - } - return jsonify(result) @app.route('/test', methods=['GET']) @@ -69,6 +36,7 @@ def getResult3(): #['Ace': {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"}] result = { + "flag":1, "result": [ { "id": "Ace", From 3aabf80c39eaadd648dc7718a9d2c041d3bc1024 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sat, 17 Jun 2023 03:45:38 +0800 Subject: [PATCH 024/164] for [ ] --- app/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index f968b1b..7355445 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -37,7 +37,7 @@ def getResult3(): #['Ace': {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"}] result = { "flag":1, - "result": [ + "result": { "id": "Ace", "family history": "心臟病, 高血壓, 糖尿病", @@ -45,6 +45,6 @@ def getResult3(): "age": "22", "height": "170" } - ] + } return jsonify(result) \ No newline at end of file From 0b96a2213fea387c1d08d9781334855a0ebd5c3b Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sat, 17 Jun 2023 03:57:02 +0800 Subject: [PATCH 025/164] testBranch --- app/__init__.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 7355445..acf659a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -6,7 +6,24 @@ app = Flask(__name__) CORS(app) +@app.route('/basicInfo', methods=['POST']) +def postForBasicInfo(): + # 取得前端傳過來的數值 + insertValues = request.get_json() + x1=insertValues['userID'] + flag = 1 + result = { + "flag":"1", + "result": + { + "familyHistory": "心臟病, 高血壓, 糖尿病", + "weight": "60", + "age": "22", + "height": "170" + } +} # LINE API + return jsonify(result) @app.route('/test', methods=['GET']) @@ -36,11 +53,11 @@ def getResult3(): #['Ace': {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"}] result = { - "flag":1, + "flag":"1", "result": { "id": "Ace", - "family history": "心臟病, 高血壓, 糖尿病", + "familyHistory": "心臟病, 高血壓, 糖尿病", "weight": "60", "age": "22", "height": "170" From 381225a10b035cde73c71459431f3f2ac25a80fd Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sat, 17 Jun 2023 04:12:37 +0800 Subject: [PATCH 026/164] symptoms --- app/__init__.py | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index acf659a..d45fbd0 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -6,20 +6,35 @@ app = Flask(__name__) CORS(app) -@app.route('/basicInfo', methods=['POST']) +@app.route('/basicInfo', methods=['GET']) def postForBasicInfo(): # 取得前端傳過來的數值 - insertValues = request.get_json() - x1=insertValues['userID'] flag = 1 result = { - "flag":"1", "result": { + "flag":"1", "familyHistory": "心臟病, 高血壓, 糖尿病", "weight": "60", - "age": "22", - "height": "170" + "age": "NONE", + "height": "NONE" + } + +} # LINE API + return jsonify(result) + +@app.route('/symptoms', methods=['POST']) +def postForBasicInfo(): + # 取得前端傳過來的數值 + insertValues = request.get_json() + x1=insertValues['userID'] + flag = 1 + result = { + "result": + { + "flag":"1", + "symptom":"我今天頭很痛" + } } # LINE API @@ -54,7 +69,7 @@ def getResult3(): #['Ace': {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"}] result = { "flag":"1", - "result": + "result":[ { "id": "Ace", "familyHistory": "心臟病, 高血壓, 糖尿病", @@ -62,6 +77,6 @@ def getResult3(): "age": "22", "height": "170" } - + ] } return jsonify(result) \ No newline at end of file From b018833bc6daa73dcedf3df9a74dab2e3fd7a173 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sat, 17 Jun 2023 04:15:05 +0800 Subject: [PATCH 027/164] fucEror --- app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index d45fbd0..afb9290 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -24,7 +24,7 @@ def postForBasicInfo(): return jsonify(result) @app.route('/symptoms', methods=['POST']) -def postForBasicInfo(): +def postForSymptoms(): # 取得前端傳過來的數值 insertValues = request.get_json() x1=insertValues['userID'] From 6fb00c5c6ce152fd23faedeac18d4d0beeb3457a Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sat, 17 Jun 2023 05:18:48 +0800 Subject: [PATCH 028/164] forClinic --- app/__init__.py | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index afb9290..e8d568a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -7,7 +7,7 @@ CORS(app) @app.route('/basicInfo', methods=['GET']) -def postForBasicInfo(): +def getForBasicInfo(): # 取得前端傳過來的數值 flag = 1 result = { @@ -40,6 +40,47 @@ def postForSymptoms(): } # LINE API return jsonify(result) +@app.route('/records', methods=['POST']) +def postForRecords(): + # 取得前端傳過來的數值 + insertValues = request.get_json() + x1=insertValues['userID'] + flag = 1 + result = { + "result": + { + "flag":"1", + "id": "Ace", + "weight": "60", + "xray": "-", + "urineob": "-", + "bloodhb": "15", + "bloodrbc": "500", + "liversgot": "25", + "liversgpt": "30", + "hbeag": "-", + "bloodwbc": "5500", + "bloodplt": "30", + "bloodht": "45", + "hbsag": "-", + "urineglucose": "-", + "cholesterol": "150", + "bloodpressure": "73-124", + "urineprotein": "-", + "kidneycre": "0.7", + "hbsab": "-", + "kidneybun": "15" + } + +} # LINE API + return jsonify(result) + +@app.route('/forClinic', methods=['POST']) +def postForClinic(): + insertValues = request.get_json() + message=insertValues['forClinic'] + return "OK" + @app.route('/test', methods=['GET']) def test(): From 4af5ca1bc3763c0f5efc256d39e5e7c7e4a3ebe9 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sat, 17 Jun 2023 06:09:40 +0800 Subject: [PATCH 029/164] new for clinic --- app/__init__.py | 78 +++++++++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 31 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index e8d568a..264959f 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -14,10 +14,11 @@ def getForBasicInfo(): "result": { "flag":"1", + "id": "Ace", "familyHistory": "心臟病, 高血壓, 糖尿病", "weight": "60", - "age": "NONE", - "height": "NONE" + "age": "18", + "height": "180" } } # LINE API @@ -40,48 +41,63 @@ def postForSymptoms(): } # LINE API return jsonify(result) -@app.route('/records', methods=['POST']) +@app.route('/forClinic', methods=['POST']) # test 從雅典娜回傳 json 檔 +def postForClinic(): + insertValues = request.get_json() + message=insertValues['forClinic'] + return "OK" + +@app.route('/records', methods=['POST']) # 缺看診紀錄 def postForRecords(): # 取得前端傳過來的數值 insertValues = request.get_json() x1=insertValues['userID'] flag = 1 result = { - "result": - { - "flag":"1", - "id": "Ace", - "weight": "60", - "xray": "-", - "urineob": "-", - "bloodhb": "15", - "bloodrbc": "500", - "liversgot": "25", - "liversgpt": "30", - "hbeag": "-", - "bloodwbc": "5500", - "bloodplt": "30", - "bloodht": "45", - "hbsag": "-", - "urineglucose": "-", - "cholesterol": "150", - "bloodpressure": "73-124", - "urineprotein": "-", - "kidneycre": "0.7", - "hbsab": "-", - "kidneybun": "15" - } + "result": + { + "flag":"1", + "id": "Ace", + "xray": "-", + "urineob": "-", + "bloodhb": "15", + "bloodrbc": "500", + "liversgot": "25", + "liversgpt": "30", + "hbeag": "-", + "bloodwbc": "5500", + "bloodplt": "30", + "bloodht": "45", + "hbsag": "-", + "urineglucose": "-", + "cholesterol": "150", + "bloodpressure": "73-124", + "urineprotein": "-", + "kidneycre": "0.7", + "hbsab": "-", + "kidneybun": "15" + "familyHistory": "心臟病, 高血壓, 糖尿病", + "weight": "60", + "age": "18", + "height": "180" + } -} # LINE API + } # LINE API return jsonify(result) -@app.route('/forClinic', methods=['POST']) -def postForClinic(): +@app.route('/nextStep', methods=['POST']) # test 從雅典娜回傳 json 檔 +def postNextStep(): insertValues = request.get_json() - message=insertValues['forClinic'] + nextStep=insertValues['nextStep'] # 兩個方向的判斷 return "OK" + + + + +####################### for early testing ############################################### + @app.route('/test', methods=['GET']) def test(): From c9341a2e4a78f476c5a2243404c3054e6b19ad49 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sat, 17 Jun 2023 06:21:28 +0800 Subject: [PATCH 030/164] nextstep --- app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 264959f..f5be818 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -88,7 +88,7 @@ def postForRecords(): @app.route('/nextStep', methods=['POST']) # test 從雅典娜回傳 json 檔 def postNextStep(): insertValues = request.get_json() - nextStep=insertValues['nextStep'] # 兩個方向的判斷 + nextstep=insertValues['nextStep'] # 兩個方向的判斷 return "OK" From 1da79c9f92f5736cd5bccc8ae2cfa86b44580433 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sat, 17 Jun 2023 06:23:56 +0800 Subject: [PATCH 031/164] partial test --- app/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index f5be818..266f686 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -85,11 +85,11 @@ def postForRecords(): } # LINE API return jsonify(result) -@app.route('/nextStep', methods=['POST']) # test 從雅典娜回傳 json 檔 -def postNextStep(): - insertValues = request.get_json() - nextstep=insertValues['nextStep'] # 兩個方向的判斷 - return "OK" +#@app.route('/nextStep', methods=['POST']) # test 從雅典娜回傳 json 檔 +#def postNextStep(): +# insertValues = request.get_json() +# nextstep=insertValues['nextStep'] # 兩個方向的判斷 +# return "OK" From 8f2bd1f98f590a1b24771841a367ae9cc10e1ad7 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sat, 17 Jun 2023 06:27:06 +0800 Subject: [PATCH 032/164] , --- app/__init__.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 266f686..a6b3662 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -75,7 +75,7 @@ def postForRecords(): "urineprotein": "-", "kidneycre": "0.7", "hbsab": "-", - "kidneybun": "15" + "kidneybun": "15", "familyHistory": "心臟病, 高血壓, 糖尿病", "weight": "60", "age": "18", @@ -85,11 +85,11 @@ def postForRecords(): } # LINE API return jsonify(result) -#@app.route('/nextStep', methods=['POST']) # test 從雅典娜回傳 json 檔 -#def postNextStep(): -# insertValues = request.get_json() -# nextstep=insertValues['nextStep'] # 兩個方向的判斷 -# return "OK" +@app.route('/nextStep', methods=['POST']) # test 從雅典娜回傳 json 檔 +def postNextStep(): + insertValues = request.get_json() + nextstep=insertValues['nextStep'] # 兩個方向的判斷 + return "OK" From 921912c808df2dc2fe5aaf66b3e76d4cf615c3e3 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sat, 17 Jun 2023 19:11:03 +0800 Subject: [PATCH 033/164] delete model.py --- app/model.py | 1 - 1 file changed, 1 deletion(-) delete mode 100644 app/model.py diff --git a/app/model.py b/app/model.py deleted file mode 100644 index 8b13789..0000000 --- a/app/model.py +++ /dev/null @@ -1 +0,0 @@ - From 1d4a7493fb8128eec194dfa3188733d979ec8ba6 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sat, 17 Jun 2023 21:34:11 +0800 Subject: [PATCH 034/164] delete basicInfo in records --- app/__init__.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index a6b3662..dc6a402 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -77,9 +77,7 @@ def postForRecords(): "hbsab": "-", "kidneybun": "15", "familyHistory": "心臟病, 高血壓, 糖尿病", - "weight": "60", - "age": "18", - "height": "180" + } } # LINE API From f2dceb37d48433808b92f52481bec94a27be1e4b Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 00:39:10 +0800 Subject: [PATCH 035/164] =?UTF-8?q?flag=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index dc6a402..429f73a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -11,9 +11,10 @@ def getForBasicInfo(): # 取得前端傳過來的數值 flag = 1 result = { + "flag":"1", "result": { - "flag":"1", + "id": "Ace", "familyHistory": "心臟病, 高血壓, 糖尿病", "weight": "60", @@ -31,9 +32,10 @@ def postForSymptoms(): x1=insertValues['userID'] flag = 1 result = { + "flag":"1", "result": { - "flag":"1", + "symptom":"我今天頭很痛" } @@ -54,9 +56,9 @@ def postForRecords(): x1=insertValues['userID'] flag = 1 result = { + "flag":"1", "result": { - "flag":"1", "id": "Ace", "xray": "-", "urineob": "-", From 4a523dcffdaedaca6583e4192ac6feee6d45a69e Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 09:20:41 +0800 Subject: [PATCH 036/164] test flag --- app/__init__.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 429f73a..d14988c 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -5,13 +5,25 @@ app = Flask(__name__) CORS(app) +flagForSymptoms = 0 +flagForBasicInfo = 0 +flagForRecords = 0 + +@app.route('/changeFlag', methods=['POST']) +def postForChangeFlag(): + global flagForSymptoms + global flagForBasicInfo + global flagForRecords + + insertValues = request.get_json() + flagForSymptoms=insertValues['flagForSymptoms'] + flagForBasicInfo=insertValues['flagForBasicInfo'] + flagForRecords=insertValues['flagForRecords'] @app.route('/basicInfo', methods=['GET']) def getForBasicInfo(): - # 取得前端傳過來的數值 - flag = 1 result = { - "flag":"1", + "flag":flagForBasicInfo, "result": { From b8b800caf98165e4fafb3dac4b49493124e45902 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 09:25:44 +0800 Subject: [PATCH 037/164] changeFlag --- app/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/__init__.py b/app/__init__.py index d14988c..af69b78 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -20,6 +20,9 @@ def postForChangeFlag(): flagForBasicInfo=insertValues['flagForBasicInfo'] flagForRecords=insertValues['flagForRecords'] + return "OK" + + @app.route('/basicInfo', methods=['GET']) def getForBasicInfo(): result = { From c0f845c0958ed2cff84b4e9096cc776fd7462d16 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 09:43:09 +0800 Subject: [PATCH 038/164] getflag --- app/__init__.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/__init__.py b/app/__init__.py index af69b78..cb0c160 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -22,6 +22,16 @@ def postForChangeFlag(): return "OK" +@app.route('/changeFlag', methods=['GET']) +def postForChangeFlag(): + + result={ + "flagForSymptoms": flagForSymptoms, + "flagForBasicInfo": flagForBasicInfo, + "flagForRecords": flagForRecords, + } + + return jsonify(result) @app.route('/basicInfo', methods=['GET']) def getForBasicInfo(): From c30388a61e3f5c12c906d734ba0d6b80e98e675e Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 09:43:57 +0800 Subject: [PATCH 039/164] get flag --- app/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index cb0c160..251a270 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -22,8 +22,8 @@ def postForChangeFlag(): return "OK" -@app.route('/changeFlag', methods=['GET']) -def postForChangeFlag(): +@app.route('/getFlag', methods=['GET']) +def getForFlag(): result={ "flagForSymptoms": flagForSymptoms, From 276523103c8fb7801fe2e4a8a26af3183d965a62 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 11:06:53 +0800 Subject: [PATCH 040/164] GET to POST --- app/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 251a270..8bcfd95 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -22,9 +22,11 @@ def postForChangeFlag(): return "OK" -@app.route('/getFlag', methods=['GET']) -def getForFlag(): - +@app.route('/getFlag', methods=['POST']) +def postForFlag(): + + insertValues = request.get_json() + x1=insertValues['userID'] result={ "flagForSymptoms": flagForSymptoms, "flagForBasicInfo": flagForBasicInfo, From df0e8e0547b7e9102f0ac9feca3a7e4f91388426 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 11:24:30 +0800 Subject: [PATCH 041/164] fastAPI --- .gitignore | 9 ++++++--- Procfile | 2 +- app.json | 14 ++++++++++++++ runtime.txt | 1 + src/__init__.py | 0 5 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 app.json create mode 100644 runtime.txt create mode 100644 src/__init__.py diff --git a/.gitignore b/.gitignore index 4ecac7d..4875ad3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ -.ipynb_checkpoints -__pycache__ -.DS_Store \ No newline at end of file +venv +*.pyc +staticfiles +.env +db.sqlite3 +getting-started/* \ No newline at end of file diff --git a/Procfile b/Procfile index 5593837..36fc594 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web gunicorn run:app \ No newline at end of file +web: uvicorn src.main:app --host=0.0.0.0 --port=${PORT:-5000} \ No newline at end of file diff --git a/app.json b/app.json new file mode 100644 index 0000000..9315228 --- /dev/null +++ b/app.json @@ -0,0 +1,14 @@ +{ + "name": "Start on Heroku: Python", + "description": "A barebones Python app, which can easily be deployed to Heroku.", + "image": "heroku/python", + "repository": "https://github.com/Hedde/fastapi-heroku-test", + "keywords": ["python", "fastapi" ], + "env": { + }, + "environments": { + "test": { + "scripts": {} + } + } + } \ No newline at end of file diff --git a/runtime.txt b/runtime.txt new file mode 100644 index 0000000..cd6f130 --- /dev/null +++ b/runtime.txt @@ -0,0 +1 @@ +python-3.11.1 \ No newline at end of file diff --git a/src/__init__.py b/src/__init__.py new file mode 100644 index 0000000..e69de29 From 18097ddf64beba7c4e538d4af8796d03cb1363c0 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 11:24:46 +0800 Subject: [PATCH 042/164] fast API --- app/__init__.py | 166 ----------------------------------------------- app/model.py | 1 - config.ini | 3 - requirements.txt | 14 ++-- run.py | 9 --- src/main.py | 19 ++++++ 6 files changed, 29 insertions(+), 183 deletions(-) delete mode 100644 app/__init__.py delete mode 100644 app/model.py delete mode 100644 config.ini delete mode 100644 run.py create mode 100644 src/main.py diff --git a/app/__init__.py b/app/__init__.py deleted file mode 100644 index 8bcfd95..0000000 --- a/app/__init__.py +++ /dev/null @@ -1,166 +0,0 @@ -# -*- coding: UTF-8 -*- -import numpy as np -from flask import Flask, request, jsonify -from flask_cors import CORS - -app = Flask(__name__) -CORS(app) -flagForSymptoms = 0 -flagForBasicInfo = 0 -flagForRecords = 0 - -@app.route('/changeFlag', methods=['POST']) -def postForChangeFlag(): - global flagForSymptoms - global flagForBasicInfo - global flagForRecords - - insertValues = request.get_json() - flagForSymptoms=insertValues['flagForSymptoms'] - flagForBasicInfo=insertValues['flagForBasicInfo'] - flagForRecords=insertValues['flagForRecords'] - - return "OK" - -@app.route('/getFlag', methods=['POST']) -def postForFlag(): - - insertValues = request.get_json() - x1=insertValues['userID'] - result={ - "flagForSymptoms": flagForSymptoms, - "flagForBasicInfo": flagForBasicInfo, - "flagForRecords": flagForRecords, - } - - return jsonify(result) - -@app.route('/basicInfo', methods=['GET']) -def getForBasicInfo(): - result = { - "flag":flagForBasicInfo, - "result": - { - - "id": "Ace", - "familyHistory": "心臟病, 高血壓, 糖尿病", - "weight": "60", - "age": "18", - "height": "180" - } - -} # LINE API - return jsonify(result) - -@app.route('/symptoms', methods=['POST']) -def postForSymptoms(): - # 取得前端傳過來的數值 - insertValues = request.get_json() - x1=insertValues['userID'] - flag = 1 - result = { - "flag":"1", - "result": - { - - "symptom":"我今天頭很痛" - - } - -} # LINE API - return jsonify(result) - -@app.route('/forClinic', methods=['POST']) # test 從雅典娜回傳 json 檔 -def postForClinic(): - insertValues = request.get_json() - message=insertValues['forClinic'] - return "OK" - -@app.route('/records', methods=['POST']) # 缺看診紀錄 -def postForRecords(): - # 取得前端傳過來的數值 - insertValues = request.get_json() - x1=insertValues['userID'] - flag = 1 - result = { - "flag":"1", - "result": - { - "id": "Ace", - "xray": "-", - "urineob": "-", - "bloodhb": "15", - "bloodrbc": "500", - "liversgot": "25", - "liversgpt": "30", - "hbeag": "-", - "bloodwbc": "5500", - "bloodplt": "30", - "bloodht": "45", - "hbsag": "-", - "urineglucose": "-", - "cholesterol": "150", - "bloodpressure": "73-124", - "urineprotein": "-", - "kidneycre": "0.7", - "hbsab": "-", - "kidneybun": "15", - "familyHistory": "心臟病, 高血壓, 糖尿病", - - } - - } # LINE API - return jsonify(result) - -@app.route('/nextStep', methods=['POST']) # test 從雅典娜回傳 json 檔 -def postNextStep(): - insertValues = request.get_json() - nextstep=insertValues['nextStep'] # 兩個方向的判斷 - return "OK" - - - - - - -####################### for early testing ############################################### - -@app.route('/test', methods=['GET']) -def test(): - - #['Ace': {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"}] - result = {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"} - return jsonify(result) - -@app.route('/right', methods=['POST']) -def postInput(): - insertValues = request.get_json() - x1=insertValues['userID'] - result = 1 - text = "我今天頭很痛" # LINE API 症狀 - return jsonify({'result': str(result), 'text': str(text)}) - -@app.route('/test2', methods=['GET']) -def getResult2(): - - #['Ace': {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"}] - result = 1 - return jsonify({'result': str(result)}) - -@app.route('/test3', methods=['GET']) -def getResult3(): - - #['Ace': {"id": "Ace","family history": "心臟病, 高血壓, 糖尿病","weight": "60","age": "22","height": "170"}] - result = { - "flag":"1", - "result":[ - { - "id": "Ace", - "familyHistory": "心臟病, 高血壓, 糖尿病", - "weight": "60", - "age": "22", - "height": "170" - } - ] -} - return jsonify(result) \ No newline at end of file diff --git a/app/model.py b/app/model.py deleted file mode 100644 index 8b13789..0000000 --- a/app/model.py +++ /dev/null @@ -1 +0,0 @@ - diff --git a/config.ini b/config.ini deleted file mode 100644 index 3b56eec..0000000 --- a/config.ini +++ /dev/null @@ -1,3 +0,0 @@ -# -*- coding: utf-8 -*- - -app.config['JSON_AS_ASCII'] = False \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 9b0a6fe..f35e748 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,10 @@ -Flask -Flask-Cors -gunicorn -numpy +Click==7.0 +fastapi==0.65.2 +gunicorn==19.9.0 +h11==0.8.1 +httptools==0.0.13 +pydantic==1.6.2 +starlette==0.12.9 +uvicorn==0.11.7 +uvloop==0.13.0 +websockets==9.1 \ No newline at end of file diff --git a/run.py b/run.py deleted file mode 100644 index 1967b5e..0000000 --- a/run.py +++ /dev/null @@ -1,9 +0,0 @@ -# -*- coding: UTF-8 -*- -from app import app - -@app.route('/') -def index(): - return 'Flask API started' - -if __name__ == '__main__': - app.run(host='0.0.0.0', port=3000, debug=False) \ No newline at end of file diff --git a/src/main.py b/src/main.py new file mode 100644 index 0000000..3e808d9 --- /dev/null +++ b/src/main.py @@ -0,0 +1,19 @@ +import socket +import sys + +from fastapi import FastAPI + +app = FastAPI() + +hostname = socket.gethostname() + +version = f"{sys.version_info.major}.{sys.version_info.minor}" + + +@app.get("/") +async def read_root(): + return { + "name": "my-app", + "host": hostname, + "version": f"Hello world! From FastAPI running on Uvicorn. Using Python {version}" + } From 656e8146b546d8783182305508e100cc964eed1b Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 11:26:35 +0800 Subject: [PATCH 043/164] starlette --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f35e748..4bfe83b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ gunicorn==19.9.0 h11==0.8.1 httptools==0.0.13 pydantic==1.6.2 -starlette==0.12.9 +starlette==0.14.2 uvicorn==0.11.7 uvloop==0.13.0 websockets==9.1 \ No newline at end of file From 6b355909c85bf344235bb03848036625ad107fec Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 11:27:50 +0800 Subject: [PATCH 044/164] requirements --- requirements.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4bfe83b..7dbfaea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ -Click==7.0 -fastapi==0.65.2 -gunicorn==19.9.0 -h11==0.8.1 -httptools==0.0.13 -pydantic==1.6.2 -starlette==0.14.2 -uvicorn==0.11.7 -uvloop==0.13.0 -websockets==9.1 \ No newline at end of file +Click +fastapi +gunicorn +h11 +httptools +pydantic +starlette +uvicorn +uvloop +websockets \ No newline at end of file From ce502fec8e84c060cc9716922a7e95c21e872f27 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 11:37:50 +0800 Subject: [PATCH 045/164] fastAPI --- src/main.py | 124 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 112 insertions(+), 12 deletions(-) diff --git a/src/main.py b/src/main.py index 3e808d9..f278ec9 100644 --- a/src/main.py +++ b/src/main.py @@ -1,19 +1,119 @@ -import socket -import sys - from fastapi import FastAPI +from pydantic import BaseModel +from typing import Optional +from fastapi.encoders import jsonable_encoder +from fastapi.responses import JSONResponse app = FastAPI() -hostname = socket.gethostname() +# Global variables +flagForSymptoms: Optional[bool] = None +flagForBasicInfo: Optional[bool] = None +flagForRecords: Optional[bool] = None + + +class FlagModel(BaseModel): + flagForSymptoms: bool + flagForBasicInfo: bool + flagForRecords: bool + + +@app.post("/changeFlag") +def post_for_change_flag(flag: FlagModel): + global flagForSymptoms + global flagForBasicInfo + global flagForRecords + + flagForSymptoms = flag.flagForSymptoms + flagForBasicInfo = flag.flagForBasicInfo + flagForRecords = flag.flagForRecords + + return "OK" + + +@app.get("/getFlag") +def get_for_flag(): + return jsonable_encoder({ + "flagForSymptoms": flagForSymptoms, + "flagForBasicInfo": flagForBasicInfo, + "flagForRecords": flagForRecords, + }) + + +@app.get("/basicInfo") +def get_for_basic_info(): + return jsonable_encoder({ + "flag": flagForBasicInfo, + "result": { + "id": "Ace", + "familyHistory": "心臟病, 高血壓, 糖尿病", + "weight": "60", + "age": "18", + "height": "180" + } + }) + + +class SymptomsModel(BaseModel): + userID: str + + +@app.post("/symptoms") +def post_for_symptoms(symptoms: SymptomsModel): + return jsonable_encoder({ + "flag": "1", + "result": { + "symptom": "我今天頭很痛" + } + }) + + +class ClinicModel(BaseModel): + forClinic: str + + +@app.post("/forClinic") +def post_for_clinic(clinic: ClinicModel): + return "OK" + + +class RecordsModel(BaseModel): + userID: str + + +@app.post("/records") +def post_for_records(records: RecordsModel): + return jsonable_encoder({ + "flag": "1", + "result": { + "id": "Ace", + "xray": "-", + "urineob": "-", + "bloodhb": "15", + "bloodrbc": "500", + "liversgot": "25", + "liversgpt": "30", + "hbeag": "-", + "bloodwbc": "5500", + "bloodplt": "30", + "bloodht": "45", + "hbsag": "-", + "urineglucose": "-", + "cholesterol": "150", + "bloodpressure": "73-124", + "urineprotein": "-", + "kidneycre": "0.7", + "hbsab": "-", + "kidneybun": "15", + "familyHistory": "心臟病, 高血壓, 糖尿病", + } + }) + -version = f"{sys.version_info.major}.{sys.version_info.minor}" +class NextStepModel(BaseModel): + nextStep: str -@app.get("/") -async def read_root(): - return { - "name": "my-app", - "host": hostname, - "version": f"Hello world! From FastAPI running on Uvicorn. Using Python {version}" - } +@app.post("/nextStep") +def post_next_step(next_step: NextStepModel): + return "OK" From abc5913f6d7042e6ec6f1d5becd6313bd6f7b448 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 15:53:37 +0800 Subject: [PATCH 046/164] test get info --- src/main.py | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/src/main.py b/src/main.py index f278ec9..8bb6cd6 100644 --- a/src/main.py +++ b/src/main.py @@ -1,8 +1,9 @@ -from fastapi import FastAPI +from fastapi import FastAPI, Form from pydantic import BaseModel from typing import Optional from fastapi.encoders import jsonable_encoder from fastapi.responses import JSONResponse +import requests app = FastAPI() @@ -40,19 +41,33 @@ def get_for_flag(): }) -@app.get("/basicInfo") -def get_for_basic_info(): - return jsonable_encoder({ - "flag": flagForBasicInfo, - "result": { - "id": "Ace", - "familyHistory": "心臟病, 高血壓, 糖尿病", - "weight": "60", - "age": "18", - "height": "180" - } - }) +class Result(BaseModel): + id: str + familyHistory: str + weight: str + age: str + height: str + +class Response(BaseModel): + result: Result + flagForBasicInfo: bool + +@app.post("/get_basic_info", response_model=Response) +async def get_basic_info(userid: str = Form(...)): + url = 'https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessbasic' + data = {'userid': userid} + response = requests.post(url, data=data) + + if response.status_code != 200: + return {"detail": "Failed to fetch data from the database."} + + response_data = response.json() + + # Wrap the response data in a 'result' field and add the 'flagForBasicInfo' field. + # Here we just set flagForBasicInfo to True for the example, you might want to replace this with actual logic. + response_data = {"result": response_data, "flagForBasicInfo": True} + return response_data class SymptomsModel(BaseModel): userID: str From 37c0064eeaf097877204c446d411f9e353c2cfed Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 16:10:45 +0800 Subject: [PATCH 047/164] die --- src/main.py | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/src/main.py b/src/main.py index 8bb6cd6..7894922 100644 --- a/src/main.py +++ b/src/main.py @@ -41,33 +41,23 @@ def get_for_flag(): }) -class Result(BaseModel): - id: str - familyHistory: str - weight: str - age: str - height: str - -class Response(BaseModel): - result: Result - flagForBasicInfo: bool - -@app.post("/get_basic_info", response_model=Response) -async def get_basic_info(userid: str = Form(...)): +@app.get("/basicInfo") +def get_for_basic_info(): + userid = "Ace" url = 'https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessbasic' data = {'userid': userid} response = requests.post(url, data=data) + return jsonable_encoder({ + "flag": flagForBasicInfo, + "result": { + "id": "Ace", + "familyHistory": "心臟病, 高血壓, 糖尿病", + "weight": "60", + "age": "18", + "height": "180" + } + }) - if response.status_code != 200: - return {"detail": "Failed to fetch data from the database."} - - response_data = response.json() - - # Wrap the response data in a 'result' field and add the 'flagForBasicInfo' field. - # Here we just set flagForBasicInfo to True for the example, you might want to replace this with actual logic. - response_data = {"result": response_data, "flagForBasicInfo": True} - - return response_data class SymptomsModel(BaseModel): userID: str From 99e2a1400f657223c23e80dc1afccd8c8478cb37 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 16:53:45 +0800 Subject: [PATCH 048/164] test API --- src/main.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main.py b/src/main.py index 7894922..4236f1a 100644 --- a/src/main.py +++ b/src/main.py @@ -1,9 +1,8 @@ -from fastapi import FastAPI, Form +from fastapi import FastAPI from pydantic import BaseModel from typing import Optional from fastapi.encoders import jsonable_encoder from fastapi.responses import JSONResponse -import requests app = FastAPI() @@ -43,10 +42,6 @@ def get_for_flag(): @app.get("/basicInfo") def get_for_basic_info(): - userid = "Ace" - url = 'https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessbasic' - data = {'userid': userid} - response = requests.post(url, data=data) return jsonable_encoder({ "flag": flagForBasicInfo, "result": { @@ -121,4 +116,4 @@ class NextStepModel(BaseModel): @app.post("/nextStep") def post_next_step(next_step: NextStepModel): - return "OK" + return "OK" \ No newline at end of file From 54351cd3a7b5dc4e7b73be5d7c4be233cf2c1cc3 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 16:59:00 +0800 Subject: [PATCH 049/164] for flag --- src/main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main.py b/src/main.py index 4236f1a..bc82c23 100644 --- a/src/main.py +++ b/src/main.py @@ -7,15 +7,15 @@ app = FastAPI() # Global variables -flagForSymptoms: Optional[bool] = None -flagForBasicInfo: Optional[bool] = None -flagForRecords: Optional[bool] = None +flagForSymptoms: Optional[int] = None +flagForBasicInfo: Optional[int] = None +flagForRecords: Optional[int] = None class FlagModel(BaseModel): - flagForSymptoms: bool - flagForBasicInfo: bool - flagForRecords: bool + flagForSymptoms: int + flagForBasicInfo: int + flagForRecords: int @app.post("/changeFlag") From c533856670b7ea133be808df32e21566ed0e629c Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 17:04:10 +0800 Subject: [PATCH 050/164] for null to 0 --- src/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.py b/src/main.py index bc82c23..6a21cbb 100644 --- a/src/main.py +++ b/src/main.py @@ -7,9 +7,9 @@ app = FastAPI() # Global variables -flagForSymptoms: Optional[int] = None -flagForBasicInfo: Optional[int] = None -flagForRecords: Optional[int] = None +flagForSymptoms: Optional[int] = 0 +flagForBasicInfo: Optional[int] = 0 +flagForRecords: Optional[int] = 0 class FlagModel(BaseModel): From 5d4c1017b2db4def9886d42d2d8a26689465aa5b Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 17:21:59 +0800 Subject: [PATCH 051/164] symptoms --- src/main.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main.py b/src/main.py index 6a21cbb..976fef5 100644 --- a/src/main.py +++ b/src/main.py @@ -61,7 +61,7 @@ class SymptomsModel(BaseModel): @app.post("/symptoms") def post_for_symptoms(symptoms: SymptomsModel): return jsonable_encoder({ - "flag": "1", + "flag": flagForSymptoms, "result": { "symptom": "我今天頭很痛" } @@ -116,4 +116,18 @@ class NextStepModel(BaseModel): @app.post("/nextStep") def post_next_step(next_step: NextStepModel): - return "OK" \ No newline at end of file + return "OK" + + +@app.get("/FakeBasicInfo") +def get_for_basic_info(): + return jsonable_encoder({ + "flag": flagForBasicInfo, + "result": { + "id": "Ace", + "familyHistory": "心臟病, 高血壓, 糖尿病", + "weight": "60", + "age": "18", + "height": "180" + } + }) From 8da9e0cb79dcf62721db6f2ab98eb1b6feaca954 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 17:47:01 +0800 Subject: [PATCH 052/164] test basicInfo --- src/main.py | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main.py b/src/main.py index 976fef5..1ad55ad 100644 --- a/src/main.py +++ b/src/main.py @@ -3,6 +3,7 @@ from typing import Optional from fastapi.encoders import jsonable_encoder from fastapi.responses import JSONResponse +import requests app = FastAPI() @@ -40,19 +41,28 @@ def get_for_flag(): }) + @app.get("/basicInfo") def get_for_basic_info(): - return jsonable_encoder({ - "flag": flagForBasicInfo, - "result": { - "id": "Ace", - "familyHistory": "心臟病, 高血壓, 糖尿病", - "weight": "60", - "age": "18", - "height": "180" - } - }) + userid = "Ace" + # Prepare the data + data = {'userid': userid} + + # Send a POST request + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessbasic', data=data) + # Extract data from the response + if response.status_code == 200: + user_data = response.json() + else: + user_data = {} + + # Prepare the final result + result = { + "flag": flagForBasicInfo, + "result": user_data + } + return jsonable_encoder(result) class SymptomsModel(BaseModel): userID: str @@ -84,7 +94,7 @@ class RecordsModel(BaseModel): @app.post("/records") def post_for_records(records: RecordsModel): return jsonable_encoder({ - "flag": "1", + "flag": flagForRecords, "result": { "id": "Ace", "xray": "-", From 21e0f535ca6be5efc7e3ec203bd13d4760e6e55d Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 18:11:25 +0800 Subject: [PATCH 053/164] test userdata --- src/main.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main.py b/src/main.py index 1ad55ad..ecdeef0 100644 --- a/src/main.py +++ b/src/main.py @@ -3,7 +3,6 @@ from typing import Optional from fastapi.encoders import jsonable_encoder from fastapi.responses import JSONResponse -import requests app = FastAPI() @@ -41,7 +40,6 @@ def get_for_flag(): }) - @app.get("/basicInfo") def get_for_basic_info(): userid = "Ace" @@ -62,7 +60,8 @@ def get_for_basic_info(): "flag": flagForBasicInfo, "result": user_data } - return jsonable_encoder(result) + return jsonable_encoder(user_data) + class SymptomsModel(BaseModel): userID: str From 2b2d595f74afb6ea6b64f0995710b996d501c2f3 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 18:15:27 +0800 Subject: [PATCH 054/164] test output --- src/main.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main.py b/src/main.py index ecdeef0..7e3931b 100644 --- a/src/main.py +++ b/src/main.py @@ -3,7 +3,7 @@ from typing import Optional from fastapi.encoders import jsonable_encoder from fastapi.responses import JSONResponse - +import requests app = FastAPI() # Global variables @@ -42,6 +42,7 @@ def get_for_flag(): @app.get("/basicInfo") def get_for_basic_info(): + global flagForBasicInfo userid = "Ace" # Prepare the data @@ -55,12 +56,13 @@ def get_for_basic_info(): else: user_data = {} + # Prepare the final result result = { "flag": flagForBasicInfo, - "result": user_data + "result": user_data['result'] } - return jsonable_encoder(user_data) + return jsonable_encoder(user_data['result']) class SymptomsModel(BaseModel): From 4a2c4b79b8dfc9a1d457efbbd834fa692fe385ac Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 18:18:52 +0800 Subject: [PATCH 055/164] test encoder --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 7e3931b..01a2e33 100644 --- a/src/main.py +++ b/src/main.py @@ -62,7 +62,7 @@ def get_for_basic_info(): "flag": flagForBasicInfo, "result": user_data['result'] } - return jsonable_encoder(user_data['result']) + return jsonable_encoder(result) class SymptomsModel(BaseModel): From 838f69d072c443375104b34ffe683acc4c0e2781 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 18:21:08 +0800 Subject: [PATCH 056/164] test flag --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 01a2e33..ab49f12 100644 --- a/src/main.py +++ b/src/main.py @@ -59,7 +59,7 @@ def get_for_basic_info(): # Prepare the final result result = { - "flag": flagForBasicInfo, + "flag": "1", "result": user_data['result'] } return jsonable_encoder(result) From bef876f4c1412cdad56094fa665fce04746941a2 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 18:22:10 +0800 Subject: [PATCH 057/164] test --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index ab49f12..0f15168 100644 --- a/src/main.py +++ b/src/main.py @@ -60,7 +60,7 @@ def get_for_basic_info(): # Prepare the final result result = { "flag": "1", - "result": user_data['result'] + # "result": user_data['result'] } return jsonable_encoder(result) From 3a30747bf8134e1f94d8398646ca0882fd921ef1 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 18:22:59 +0800 Subject: [PATCH 058/164] all del --- src/main.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main.py b/src/main.py index 0f15168..cb4154b 100644 --- a/src/main.py +++ b/src/main.py @@ -48,13 +48,13 @@ def get_for_basic_info(): # Prepare the data data = {'userid': userid} - # Send a POST request - response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessbasic', data=data) - # Extract data from the response - if response.status_code == 200: - user_data = response.json() - else: - user_data = {} + # # Send a POST request + # response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessbasic', data=data) + # # Extract data from the response + # if response.status_code == 200: + # user_data = response.json() + # else: + # user_data = {} # Prepare the final result From e7b2fc87d2361f1ddc99d5b5357c0bf2e38f7fdd Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 18:28:25 +0800 Subject: [PATCH 059/164] test --- requirements.txt | 3 ++- src/main.py | 21 +++++++++------------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7dbfaea..9548e08 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,4 +7,5 @@ pydantic starlette uvicorn uvloop -websockets \ No newline at end of file +websockets +requets \ No newline at end of file diff --git a/src/main.py b/src/main.py index cb4154b..685d966 100644 --- a/src/main.py +++ b/src/main.py @@ -42,29 +42,26 @@ def get_for_flag(): @app.get("/basicInfo") def get_for_basic_info(): - global flagForBasicInfo userid = "Ace" # Prepare the data data = {'userid': userid} - # # Send a POST request - # response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessbasic', data=data) - # # Extract data from the response - # if response.status_code == 200: - # user_data = response.json() - # else: - # user_data = {} - + # Send a POST request + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessbasic', data=data) + # Extract data from the response + if response.status_code == 200: + user_data = response.json() + else: + user_data = {} # Prepare the final result result = { - "flag": "1", - # "result": user_data['result'] + "flag": flagForBasicInfo, + "result": user_data } return jsonable_encoder(result) - class SymptomsModel(BaseModel): userID: str From 11d0f89f8ce000d2064b56e4155d0b7674bf03e0 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 18:29:48 +0800 Subject: [PATCH 060/164] test --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9548e08..07d25a4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,4 +8,4 @@ starlette uvicorn uvloop websockets -requets \ No newline at end of file +requests \ No newline at end of file From f5abe3657ede6a5b17b495c4c0b92a6abc21b1de Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 18:33:12 +0800 Subject: [PATCH 061/164] correct --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 685d966..bf0de16 100644 --- a/src/main.py +++ b/src/main.py @@ -58,7 +58,7 @@ def get_for_basic_info(): # Prepare the final result result = { "flag": flagForBasicInfo, - "result": user_data + "result": user_data['result'] } return jsonable_encoder(result) From 4aa0cc797b413d8dd6a1e2b0ea1ea225cd7bf35d Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 18:42:38 +0800 Subject: [PATCH 062/164] add userID --- src/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main.py b/src/main.py index bf0de16..7af6013 100644 --- a/src/main.py +++ b/src/main.py @@ -58,6 +58,7 @@ def get_for_basic_info(): # Prepare the final result result = { "flag": flagForBasicInfo, + "userID":userid, "result": user_data['result'] } return jsonable_encoder(result) @@ -71,6 +72,7 @@ def post_for_symptoms(symptoms: SymptomsModel): return jsonable_encoder({ "flag": flagForSymptoms, "result": { + "symptom": "我今天頭很痛" } }) From 80b9d1d9f12c50000bdddbbd7515e6a619e5bc0b Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 19:02:55 +0800 Subject: [PATCH 063/164] test symptoms --- src/main.py | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/src/main.py b/src/main.py index 7af6013..b064e62 100644 --- a/src/main.py +++ b/src/main.py @@ -69,13 +69,27 @@ class SymptomsModel(BaseModel): @app.post("/symptoms") def post_for_symptoms(symptoms: SymptomsModel): - return jsonable_encoder({ + + userid = symptoms.userid + + # Prepare the data + data = {'userid': userid} + + # Send a POST request + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accesssymptoms', data=data) + # Extract data from the response + if response.status_code == 200: + user_data = response.json() + else: + user_data = {} + + # Prepare the final result + result = { "flag": flagForSymptoms, - "result": { + "result": user_data['result'] + } - "symptom": "我今天頭很痛" - } - }) + return jsonable_encoder(result) class ClinicModel(BaseModel): From 37b4e12c4355c5e2c20a4bf47ee3d6ab80a4467b Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 19:07:53 +0800 Subject: [PATCH 064/164] fix userID --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index b064e62..d956e8d 100644 --- a/src/main.py +++ b/src/main.py @@ -70,7 +70,7 @@ class SymptomsModel(BaseModel): @app.post("/symptoms") def post_for_symptoms(symptoms: SymptomsModel): - userid = symptoms.userid + userid = symptoms.userID # Prepare the data data = {'userid': userid} From 2d67672cca6e225b84a497218c1e8a35bb4e845a Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 19:23:26 +0800 Subject: [PATCH 065/164] forclinic --- src/main.py | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/main.py b/src/main.py index d956e8d..b1cf30c 100644 --- a/src/main.py +++ b/src/main.py @@ -10,12 +10,13 @@ flagForSymptoms: Optional[int] = 0 flagForBasicInfo: Optional[int] = 0 flagForRecords: Optional[int] = 0 - +flagForClinic: Optional[int] = 0 class FlagModel(BaseModel): flagForSymptoms: int flagForBasicInfo: int flagForRecords: int + flagForClinic: int @app.post("/changeFlag") @@ -23,10 +24,12 @@ def post_for_change_flag(flag: FlagModel): global flagForSymptoms global flagForBasicInfo global flagForRecords + global flagForClinic flagForSymptoms = flag.flagForSymptoms flagForBasicInfo = flag.flagForBasicInfo flagForRecords = flag.flagForRecords + flagForClinic = flag.flagForClinic return "OK" @@ -37,6 +40,8 @@ def get_for_flag(): "flagForSymptoms": flagForSymptoms, "flagForBasicInfo": flagForBasicInfo, "flagForRecords": flagForRecords, + "flagForClinic": flagForClinic, + }) @@ -93,12 +98,31 @@ def post_for_symptoms(symptoms: SymptomsModel): class ClinicModel(BaseModel): - forClinic: str + userID: str @app.post("/forClinic") def post_for_clinic(clinic: ClinicModel): - return "OK" + userid = clinic.userID + + # Prepare the data + data = {'userid': userid} + + # Send a POST request + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessdiagnosis', data=data) + # Extract data from the response + if response.status_code == 200: + user_data = response.json() + else: + user_data = {} + + # Prepare the final result + result = { + "flag": flagForClinic, + "result": user_data['result'] + } + + return jsonable_encoder(result) class RecordsModel(BaseModel): From 33ca0190890456a524d1a2f415abeaf4f84a3c9c Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 20:12:07 +0800 Subject: [PATCH 066/164] records --- src/main.py | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/src/main.py b/src/main.py index b1cf30c..e7b2304 100644 --- a/src/main.py +++ b/src/main.py @@ -131,31 +131,26 @@ class RecordsModel(BaseModel): @app.post("/records") def post_for_records(records: RecordsModel): - return jsonable_encoder({ + userid = records.userID + + # Prepare the data + data = {'userid': userid} + + # Send a POST request + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accesstestinfo', data=data) + # Extract data from the response + if response.status_code == 200: + user_data = response.json() + else: + user_data = {} + + # Prepare the final result + result = { "flag": flagForRecords, - "result": { - "id": "Ace", - "xray": "-", - "urineob": "-", - "bloodhb": "15", - "bloodrbc": "500", - "liversgot": "25", - "liversgpt": "30", - "hbeag": "-", - "bloodwbc": "5500", - "bloodplt": "30", - "bloodht": "45", - "hbsag": "-", - "urineglucose": "-", - "cholesterol": "150", - "bloodpressure": "73-124", - "urineprotein": "-", - "kidneycre": "0.7", - "hbsab": "-", - "kidneybun": "15", - "familyHistory": "心臟病, 高血壓, 糖尿病", - } - }) + "result": user_data['result'] + } + + return jsonable_encoder(result) class NextStepModel(BaseModel): From aa0761da187192e7cc008a9fdd8597854a0c3b3f Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 20:52:03 +0800 Subject: [PATCH 067/164] test auto change flag --- src/main.py | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main.py b/src/main.py index e7b2304..affbd45 100644 --- a/src/main.py +++ b/src/main.py @@ -4,6 +4,8 @@ from fastapi.encoders import jsonable_encoder from fastapi.responses import JSONResponse import requests +import time + app = FastAPI() # Global variables @@ -12,6 +14,8 @@ flagForRecords: Optional[int] = 0 flagForClinic: Optional[int] = 0 +urlForChange= "https://for-api-32f276cf322d.herokuapp.com/changeFlag" + class FlagModel(BaseModel): flagForSymptoms: int flagForBasicInfo: int @@ -48,7 +52,7 @@ def get_for_flag(): @app.get("/basicInfo") def get_for_basic_info(): userid = "Ace" - + flag = flagForBasicInfo # Prepare the data data = {'userid': userid} @@ -62,10 +66,26 @@ def get_for_basic_info(): # Prepare the final result result = { - "flag": flagForBasicInfo, + "flag": flag, "userID":userid, "result": user_data['result'] } + changeFlag = { + "flagForSymptoms": flagForSymptoms, + "flagForBasicInfo": 0, + "flagForRecords": flagForRecords, + "flagForClinic": flagForClinic, + } + for i in range(5): + # Send a POST request + response = requests.post(urlForChange, data=changeFlag) + # Extract data from the response + if response.status_code == 200: + user_data = response.json() + else: + user_data = {} + time.sleep(0.2) + return jsonable_encoder(result) class SymptomsModel(BaseModel): From 5b0f1d3c6a987dcfb819eab659a53fa10b8ed2a5 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 20:56:04 +0800 Subject: [PATCH 068/164] test erro --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index affbd45..b122af7 100644 --- a/src/main.py +++ b/src/main.py @@ -86,7 +86,7 @@ def get_for_basic_info(): user_data = {} time.sleep(0.2) - return jsonable_encoder(result) + return jsonable_encoder(result)+user_data class SymptomsModel(BaseModel): userID: str From 064aec297ea2ef04c5944fce8a9bd72a8d796fdc Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 20:58:44 +0800 Subject: [PATCH 069/164] test erro --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index b122af7..65448d8 100644 --- a/src/main.py +++ b/src/main.py @@ -86,7 +86,7 @@ def get_for_basic_info(): user_data = {} time.sleep(0.2) - return jsonable_encoder(result)+user_data + return jsonable_encoder(user_data) class SymptomsModel(BaseModel): userID: str From 4ea904277f6ebd6392e3eab4d9c6c79dce2663cd Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 21:01:43 +0800 Subject: [PATCH 070/164] test erro --- src/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.py b/src/main.py index 65448d8..de65f82 100644 --- a/src/main.py +++ b/src/main.py @@ -78,7 +78,7 @@ def get_for_basic_info(): } for i in range(5): # Send a POST request - response = requests.post(urlForChange, data=changeFlag) + response = requests.post(urlForChange, json=changeFlag) # Extract data from the response if response.status_code == 200: user_data = response.json() @@ -86,7 +86,7 @@ def get_for_basic_info(): user_data = {} time.sleep(0.2) - return jsonable_encoder(user_data) + return jsonable_encoder(result) class SymptomsModel(BaseModel): userID: str From 89aa6fc14ace34b91e4fcb2e2577008d95a43229 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Sun, 18 Jun 2023 21:21:16 +0800 Subject: [PATCH 071/164] finish reset flag --- src/main.py | 59 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/src/main.py b/src/main.py index de65f82..2e8e558 100644 --- a/src/main.py +++ b/src/main.py @@ -53,6 +53,7 @@ def get_for_flag(): def get_for_basic_info(): userid = "Ace" flag = flagForBasicInfo + # Prepare the data data = {'userid': userid} @@ -96,6 +97,7 @@ class SymptomsModel(BaseModel): def post_for_symptoms(symptoms: SymptomsModel): userid = symptoms.userID + flag = flagForSymptoms # Prepare the data data = {'userid': userid} @@ -110,10 +112,24 @@ def post_for_symptoms(symptoms: SymptomsModel): # Prepare the final result result = { - "flag": flagForSymptoms, + "flag": flag, "result": user_data['result'] } - + changeFlag = { + "flagForSymptoms": 0, + "flagForBasicInfo": flagForBasicInfo, + "flagForRecords": flagForRecords, + "flagForClinic": flagForClinic, + } + for i in range(5): + # Send a POST request + response = requests.post(urlForChange, json=changeFlag) + # Extract data from the response + if response.status_code == 200: + user_data = response.json() + else: + user_data = {} + time.sleep(0.2) return jsonable_encoder(result) @@ -124,6 +140,7 @@ class ClinicModel(BaseModel): @app.post("/forClinic") def post_for_clinic(clinic: ClinicModel): userid = clinic.userID + flag = flagForClinic # Prepare the data data = {'userid': userid} @@ -138,10 +155,24 @@ def post_for_clinic(clinic: ClinicModel): # Prepare the final result result = { - "flag": flagForClinic, + "flag": flag, "result": user_data['result'] } - + changeFlag = { + "flagForSymptoms": flagForSymptoms, + "flagForBasicInfo": flagForBasicInfo, + "flagForRecords": flagForRecords, + "flagForClinic": 0, + } + for i in range(5): + # Send a POST request + response = requests.post(urlForChange, json=changeFlag) + # Extract data from the response + if response.status_code == 200: + user_data = response.json() + else: + user_data = {} + time.sleep(0.2) return jsonable_encoder(result) @@ -152,6 +183,7 @@ class RecordsModel(BaseModel): @app.post("/records") def post_for_records(records: RecordsModel): userid = records.userID + flag = flagForRecords # Prepare the data data = {'userid': userid} @@ -166,10 +198,25 @@ def post_for_records(records: RecordsModel): # Prepare the final result result = { - "flag": flagForRecords, + "flag": flag, "result": user_data['result'] } - + changeFlag = { + "flagForSymptoms": flagForSymptoms, + "flagForBasicInfo": flagForBasicInfo, + "flagForRecords": 0, + "flagForClinic": flagForClinic, + } + for i in range(5): + # Send a POST request + response = requests.post(urlForChange, json=changeFlag) + # Extract data from the response + if response.status_code == 200: + user_data = response.json() + else: + user_data = {} + time.sleep(0.2) + return jsonable_encoder(result) From 1d531e08ffb5fbeccbfd971d164749a0e0264669 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Mon, 19 Jun 2023 20:21:50 +0800 Subject: [PATCH 072/164] change flag --- src/main.py | 53 ++++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/src/main.py b/src/main.py index 2e8e558..c1b4b71 100644 --- a/src/main.py +++ b/src/main.py @@ -17,10 +17,9 @@ urlForChange= "https://for-api-32f276cf322d.herokuapp.com/changeFlag" class FlagModel(BaseModel): - flagForSymptoms: int - flagForBasicInfo: int - flagForRecords: int - flagForClinic: int + target: str + val: int + @app.post("/changeFlag") @@ -30,12 +29,24 @@ def post_for_change_flag(flag: FlagModel): global flagForRecords global flagForClinic - flagForSymptoms = flag.flagForSymptoms - flagForBasicInfo = flag.flagForBasicInfo - flagForRecords = flag.flagForRecords - flagForClinic = flag.flagForClinic + if flag.target == "flagForSymptoms": + flagForSymptoms = flag.val + return "OK" + + elif flag.target == "flagForSymptoms": + flagForSymptoms = flag.val + return "OK" + + elif flag.target == "flagForSymptoms": + flagForSymptoms = flag.val + return "OK" + + elif flag.target == "flagForSymptoms": + flagForSymptoms = flag.val + return "OK" + - return "OK" + return "fail" @app.get("/getFlag") @@ -72,10 +83,8 @@ def get_for_basic_info(): "result": user_data['result'] } changeFlag = { - "flagForSymptoms": flagForSymptoms, - "flagForBasicInfo": 0, - "flagForRecords": flagForRecords, - "flagForClinic": flagForClinic, + "target": "flagForBasicInfo", + "val": 0, } for i in range(5): # Send a POST request @@ -116,10 +125,8 @@ def post_for_symptoms(symptoms: SymptomsModel): "result": user_data['result'] } changeFlag = { - "flagForSymptoms": 0, - "flagForBasicInfo": flagForBasicInfo, - "flagForRecords": flagForRecords, - "flagForClinic": flagForClinic, + "target": "flagForSymptoms", + "val": 0, } for i in range(5): # Send a POST request @@ -159,10 +166,8 @@ def post_for_clinic(clinic: ClinicModel): "result": user_data['result'] } changeFlag = { - "flagForSymptoms": flagForSymptoms, - "flagForBasicInfo": flagForBasicInfo, - "flagForRecords": flagForRecords, - "flagForClinic": 0, + "target": "flagForClinic", + "val": 0, } for i in range(5): # Send a POST request @@ -202,10 +207,8 @@ def post_for_records(records: RecordsModel): "result": user_data['result'] } changeFlag = { - "flagForSymptoms": flagForSymptoms, - "flagForBasicInfo": flagForBasicInfo, - "flagForRecords": 0, - "flagForClinic": flagForClinic, + "target": "flagForRecords", + "val": 0, } for i in range(5): # Send a POST request From 2adc0a6c52d1a5ebb53fb1fc1d0ea2ff7c96285d Mon Sep 17 00:00:00 2001 From: jack80806 Date: Mon, 19 Jun 2023 21:01:32 +0800 Subject: [PATCH 073/164] set flag name --- src/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.py b/src/main.py index c1b4b71..52dc5ef 100644 --- a/src/main.py +++ b/src/main.py @@ -33,15 +33,15 @@ def post_for_change_flag(flag: FlagModel): flagForSymptoms = flag.val return "OK" - elif flag.target == "flagForSymptoms": + elif flag.target == "flagForBasicInfo": flagForSymptoms = flag.val return "OK" - elif flag.target == "flagForSymptoms": + elif flag.target == "flagForRecords": flagForSymptoms = flag.val return "OK" - elif flag.target == "flagForSymptoms": + elif flag.target == "flagForClinic": flagForSymptoms = flag.val return "OK" From 2db72878b420b6e03818e2c128ef794dd6fd1d3e Mon Sep 17 00:00:00 2001 From: jack80806 Date: Mon, 19 Jun 2023 22:48:29 +0800 Subject: [PATCH 074/164] changeAllFlag --- src/main.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/main.py b/src/main.py index 52dc5ef..f0978eb 100644 --- a/src/main.py +++ b/src/main.py @@ -49,6 +49,29 @@ def post_for_change_flag(flag: FlagModel): return "fail" + +class AllFlagModel(BaseModel): + flagForSymptoms: int + flagForBasicInfo: int + flagForRecords: int + flagForClinic: int + + +@app.post("/changeAllFlag") +def post_for_change_flag(flag: AllFlagModel): + global flagForSymptoms + global flagForBasicInfo + global flagForRecords + global flagForClinic + + flagForSymptoms = flag.flagForSymptoms + flagForBasicInfo = flag.flagForBasicInfo + flagForRecords = flag.flagForRecords + flagForClinic = flag.flagForClinic + + return "OK" + + @app.get("/getFlag") def get_for_flag(): return jsonable_encoder({ From a08a55ed42a9306f1d6b705304a78f205cfc72d4 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Mon, 19 Jun 2023 22:50:26 +0800 Subject: [PATCH 075/164] changeAllFlag --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index f0978eb..99447d7 100644 --- a/src/main.py +++ b/src/main.py @@ -58,7 +58,7 @@ class AllFlagModel(BaseModel): @app.post("/changeAllFlag") -def post_for_change_flag(flag: AllFlagModel): +def post_for_change_All_flag(flag: AllFlagModel): global flagForSymptoms global flagForBasicInfo global flagForRecords From 0ef010d6d043e79d7f572865d8ff4bcde2d2dd74 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Mon, 19 Jun 2023 22:53:58 +0800 Subject: [PATCH 076/164] debug --- src/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.py b/src/main.py index 99447d7..c45d3a3 100644 --- a/src/main.py +++ b/src/main.py @@ -34,15 +34,15 @@ def post_for_change_flag(flag: FlagModel): return "OK" elif flag.target == "flagForBasicInfo": - flagForSymptoms = flag.val + flagForBasicInfo = flag.val return "OK" elif flag.target == "flagForRecords": - flagForSymptoms = flag.val + flagForRecords = flag.val return "OK" elif flag.target == "flagForClinic": - flagForSymptoms = flag.val + flagForClinic = flag.val return "OK" From 8c13b83952d6a2dd06ca41b5342aaba8670b3920 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 01:27:47 +0800 Subject: [PATCH 077/164] flag --- src/main.py | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/src/main.py b/src/main.py index c45d3a3..721cc1e 100644 --- a/src/main.py +++ b/src/main.py @@ -133,33 +133,35 @@ def post_for_symptoms(symptoms: SymptomsModel): # Prepare the data data = {'userid': userid} - - # Send a POST request - response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accesssymptoms', data=data) - # Extract data from the response - if response.status_code == 200: - user_data = response.json() - else: - user_data = {} - - # Prepare the final result - result = { - "flag": flag, - "result": user_data['result'] - } - changeFlag = { - "target": "flagForSymptoms", - "val": 0, - } - for i in range(5): + if flagForSymptoms == 1: # Send a POST request - response = requests.post(urlForChange, json=changeFlag) + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accesssymptoms', data=data) # Extract data from the response if response.status_code == 200: user_data = response.json() else: user_data = {} - time.sleep(0.2) + # Prepare the final result + result = { + "flag": flag, + "result": user_data['result'] + } + changeFlag = { + "target": "flagForSymptoms", + "val": 0, + } + for i in range(5): + # Send a POST request + response = requests.post(urlForChange, json=changeFlag) + # Extract data from the response + if response.status_code == 200: + user_data = response.json() + else: + user_data = {} + time.sleep(0.2) + else: + result = "Fail" + return jsonable_encoder(result) From 3c2adec8f46607066c818c2c83734010f0b8dd26 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 02:15:52 +0800 Subject: [PATCH 078/164] return --- src/main.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 721cc1e..dff9c98 100644 --- a/src/main.py +++ b/src/main.py @@ -160,7 +160,10 @@ def post_for_symptoms(symptoms: SymptomsModel): user_data = {} time.sleep(0.2) else: - result = "Fail" + result = { + "flag":0, + "symptoms":"" + } return jsonable_encoder(result) From ab9d983bc0abd1496dac44d3081e796900a8989b Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 02:19:02 +0800 Subject: [PATCH 079/164] result --- src/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main.py b/src/main.py index dff9c98..06e83d0 100644 --- a/src/main.py +++ b/src/main.py @@ -162,7 +162,9 @@ def post_for_symptoms(symptoms: SymptomsModel): else: result = { "flag":0, + "result":{ "symptoms":"" + } } return jsonable_encoder(result) From b6115cb36fc755cf6ae84dd4143e1e9d2496ecd1 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 03:57:35 +0800 Subject: [PATCH 080/164] 123 --- src/main.py | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/src/main.py b/src/main.py index 06e83d0..72819e2 100644 --- a/src/main.py +++ b/src/main.py @@ -85,7 +85,7 @@ def get_for_flag(): @app.get("/basicInfo") def get_for_basic_info(): - userid = "Ace" + userid = "Ue1350bef1851afd418a9aa81e444eaa7" flag = flagForBasicInfo # Prepare the data @@ -105,32 +105,30 @@ def get_for_basic_info(): "userID":userid, "result": user_data['result'] } - changeFlag = { - "target": "flagForBasicInfo", - "val": 0, - } - for i in range(5): - # Send a POST request - response = requests.post(urlForChange, json=changeFlag) - # Extract data from the response - if response.status_code == 200: - user_data = response.json() - else: - user_data = {} - time.sleep(0.2) + # changeFlag = { + # "target": "flagForBasicInfo", + # "val": 0, + # } + # for i in range(5): + # # Send a POST request + # response = requests.post(urlForChange, json=changeFlag) + # # Extract data from the response + # if response.status_code == 200: + # user_data = response.json() + # else: + # user_data = {} + # time.sleep(0.2) return jsonable_encoder(result) + class SymptomsModel(BaseModel): userID: str - - @app.post("/symptoms") def post_for_symptoms(symptoms: SymptomsModel): - + userid = symptoms.userID flag = flagForSymptoms - # Prepare the data data = {'userid': userid} if flagForSymptoms == 1: @@ -172,16 +170,12 @@ def post_for_symptoms(symptoms: SymptomsModel): class ClinicModel(BaseModel): userID: str - - @app.post("/forClinic") def post_for_clinic(clinic: ClinicModel): userid = clinic.userID flag = flagForClinic - # Prepare the data data = {'userid': userid} - # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessdiagnosis', data=data) # Extract data from the response @@ -189,7 +183,6 @@ def post_for_clinic(clinic: ClinicModel): user_data = response.json() else: user_data = {} - # Prepare the final result result = { "flag": flag, @@ -213,8 +206,6 @@ def post_for_clinic(clinic: ClinicModel): class RecordsModel(BaseModel): userID: str - - @app.post("/records") def post_for_records(records: RecordsModel): userid = records.userID @@ -255,8 +246,6 @@ def post_for_records(records: RecordsModel): class NextStepModel(BaseModel): nextStep: str - - @app.post("/nextStep") def post_next_step(next_step: NextStepModel): return "OK" From f974e881113a976bd57219e6dd55dd8ea1e75733 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 04:12:46 +0800 Subject: [PATCH 081/164] 123 --- src/main.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/main.py b/src/main.py index 72819e2..4ee9b5a 100644 --- a/src/main.py +++ b/src/main.py @@ -148,6 +148,33 @@ def post_for_symptoms(symptoms: SymptomsModel): "target": "flagForSymptoms", "val": 0, } + # Prepare the data + data1 = {'userid': userid, + 'diagnosis': "發炎, 開立消炎藥"} + # Send a POST request + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/diagnosis', data=data1) + # Prepare the data + data2 = { + "尿潛血": "-", + "B型肝炎e抗原": "-", + "B型肝炎表面抗原": "-", + "B型肝炎表面抗體": "-", + "尿蛋白": "-", + "尿糖": "-", + "丙酮酸轉氨基酵素": "30 U/L", + "尿素氮": "15 mg/dL", + "平均血球容積比": "45 %", + "草酸轉氨基酵素": "25 U/L", + "血壓": "舒張壓:73, 收縮壓:124", + "血小板": "30 10^3 /uL", + "白血球": "5500 10^3/uL", + "紅血球": "5 10^6/uL", + "血色素": "15 g/dL", + "膽固醇": "150 mg/dL", + "肌酸酐": "0.7 mg/dL" + } + # Send a POST request + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/testinfo', data=data2) for i in range(5): # Send a POST request response = requests.post(urlForChange, json=changeFlag) From e909913f914e057fff88debdb1ad9ae746fa1a4a Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 04:25:23 +0800 Subject: [PATCH 082/164] return --- src/main.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main.py b/src/main.py index 4ee9b5a..2c03a73 100644 --- a/src/main.py +++ b/src/main.py @@ -140,16 +140,14 @@ def post_for_symptoms(symptoms: SymptomsModel): else: user_data = {} # Prepare the final result + result = { "flag": flag, "result": user_data['result'] } - changeFlag = { - "target": "flagForSymptoms", - "val": 0, - } - # Prepare the data + # Prepare the data data1 = {'userid': userid, + "returns": "否", 'diagnosis': "發炎, 開立消炎藥"} # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/diagnosis', data=data1) @@ -175,6 +173,11 @@ def post_for_symptoms(symptoms: SymptomsModel): } # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/testinfo', data=data2) + changeFlag = { + "target": "flagForSymptoms", + "val": 0, + } + for i in range(5): # Send a POST request response = requests.post(urlForChange, json=changeFlag) @@ -192,7 +195,7 @@ def post_for_symptoms(symptoms: SymptomsModel): } } - return jsonable_encoder(result) + return jsonable_encoder(response) class ClinicModel(BaseModel): From 86c58b03c2780ffcbb7e947fd875a33509d6e798 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 04:30:30 +0800 Subject: [PATCH 083/164] debug --- src/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.py b/src/main.py index 2c03a73..094e0d9 100644 --- a/src/main.py +++ b/src/main.py @@ -153,6 +153,7 @@ def post_for_symptoms(symptoms: SymptomsModel): response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/diagnosis', data=data1) # Prepare the data data2 = { + 'userid': userid, "尿潛血": "-", "B型肝炎e抗原": "-", "B型肝炎表面抗原": "-", From 434ab34715734904d91086071f7e702a10270ae4 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 04:39:38 +0800 Subject: [PATCH 084/164] debug --- src/main.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main.py b/src/main.py index 094e0d9..82c76c5 100644 --- a/src/main.py +++ b/src/main.py @@ -107,7 +107,7 @@ def get_for_basic_info(): } # changeFlag = { # "target": "flagForBasicInfo", - # "val": 0, + # "val": 0 # } # for i in range(5): # # Send a POST request @@ -142,12 +142,12 @@ def post_for_symptoms(symptoms: SymptomsModel): # Prepare the final result result = { - "flag": flag, - "result": user_data['result'] + 'flag': flag, + 'result': user_data['result'] } # Prepare the data data1 = {'userid': userid, - "returns": "否", + 'returns': "否", 'diagnosis': "發炎, 開立消炎藥"} # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/diagnosis', data=data1) @@ -176,7 +176,7 @@ def post_for_symptoms(symptoms: SymptomsModel): response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/testinfo', data=data2) changeFlag = { "target": "flagForSymptoms", - "val": 0, + "val": 0 } for i in range(5): @@ -196,7 +196,7 @@ def post_for_symptoms(symptoms: SymptomsModel): } } - return jsonable_encoder(response) + return jsonable_encoder(result) class ClinicModel(BaseModel): @@ -221,7 +221,7 @@ def post_for_clinic(clinic: ClinicModel): } changeFlag = { "target": "flagForClinic", - "val": 0, + "val": 0 } for i in range(5): # Send a POST request @@ -260,7 +260,7 @@ def post_for_records(records: RecordsModel): } changeFlag = { "target": "flagForRecords", - "val": 0, + "val": 0 } for i in range(5): # Send a POST request From b43589f84f0198e47d0f92a703336fb487bceda6 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 04:56:05 +0800 Subject: [PATCH 085/164] name --- src/main.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main.py b/src/main.py index 82c76c5..ba5babf 100644 --- a/src/main.py +++ b/src/main.py @@ -154,23 +154,23 @@ def post_for_symptoms(symptoms: SymptomsModel): # Prepare the data data2 = { 'userid': userid, - "尿潛血": "-", - "B型肝炎e抗原": "-", - "B型肝炎表面抗原": "-", - "B型肝炎表面抗體": "-", - "尿蛋白": "-", - "尿糖": "-", - "丙酮酸轉氨基酵素": "30 U/L", - "尿素氮": "15 mg/dL", - "平均血球容積比": "45 %", - "草酸轉氨基酵素": "25 U/L", - "血壓": "舒張壓:73, 收縮壓:124", - "血小板": "30 10^3 /uL", - "白血球": "5500 10^3/uL", - "紅血球": "5 10^6/uL", - "血色素": "15 g/dL", - "膽固醇": "150 mg/dL", - "肌酸酐": "0.7 mg/dL" + "urineprotein": "-", + "urineob": "-", + "urineglucose": "-", + "bloodhb": "15", + "bloodht": "45", + "bloodplt": "30", + "bloodpressure": "73-124", + "bloodrbc": "500", + "bloodwbc": "5500 %", + "cholesterol": "150", + "hbeag": "-", + "hbsab": "-", + "hbsag": "-", + "kidneybun": "15", + "liversgot": "25", + "liversgpt": "30", + "kidneycre": "0.7" } # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/testinfo', data=data2) From 7ea0fc1ff3e045e02a4e180d3feeaf79062c9c08 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 05:02:32 +0800 Subject: [PATCH 086/164] OK --- src/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.py b/src/main.py index ba5babf..dbe739b 100644 --- a/src/main.py +++ b/src/main.py @@ -11,8 +11,8 @@ # Global variables flagForSymptoms: Optional[int] = 0 flagForBasicInfo: Optional[int] = 0 -flagForRecords: Optional[int] = 0 -flagForClinic: Optional[int] = 0 +flagForRecords: Optional[int] = 1 +flagForClinic: Optional[int] = 1 urlForChange= "https://for-api-32f276cf322d.herokuapp.com/changeFlag" From 156e40765a01d1477b48492750743e388217c733 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 15:27:16 +0800 Subject: [PATCH 087/164] del rec cli Cflag --- src/main.py | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/src/main.py b/src/main.py index dbe739b..2f98cd4 100644 --- a/src/main.py +++ b/src/main.py @@ -219,19 +219,7 @@ def post_for_clinic(clinic: ClinicModel): "flag": flag, "result": user_data['result'] } - changeFlag = { - "target": "flagForClinic", - "val": 0 - } - for i in range(5): - # Send a POST request - response = requests.post(urlForChange, json=changeFlag) - # Extract data from the response - if response.status_code == 200: - user_data = response.json() - else: - user_data = {} - time.sleep(0.2) + return jsonable_encoder(result) @@ -258,19 +246,7 @@ def post_for_records(records: RecordsModel): "flag": flag, "result": user_data['result'] } - changeFlag = { - "target": "flagForRecords", - "val": 0 - } - for i in range(5): - # Send a POST request - response = requests.post(urlForChange, json=changeFlag) - # Extract data from the response - if response.status_code == 200: - user_data = response.json() - else: - user_data = {} - time.sleep(0.2) + return jsonable_encoder(result) From 1a7e7df548a5424b0e87cc5aedfc70b77d266705 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 19:52:21 +0800 Subject: [PATCH 088/164] for clinic --- src/main.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main.py b/src/main.py index 2f98cd4..a1b6ef7 100644 --- a/src/main.py +++ b/src/main.py @@ -216,8 +216,7 @@ def post_for_clinic(clinic: ClinicModel): user_data = {} # Prepare the final result result = { - "flag": flag, - "result": user_data['result'] + user_data['result'] } return jsonable_encoder(result) From 985128f27867db09df5dd72cc7be622b3f6ad218 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 19:52:58 +0800 Subject: [PATCH 089/164] forClinic --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index a1b6ef7..a9b0abf 100644 --- a/src/main.py +++ b/src/main.py @@ -216,7 +216,7 @@ def post_for_clinic(clinic: ClinicModel): user_data = {} # Prepare the final result result = { - user_data['result'] + "result": user_data['result'] } return jsonable_encoder(result) From 638fe90a250a0ab1ea797d76e9103b7d43aa6f6b Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 19:58:09 +0800 Subject: [PATCH 090/164] 123 --- src/main.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main.py b/src/main.py index a9b0abf..b751ad0 100644 --- a/src/main.py +++ b/src/main.py @@ -262,10 +262,7 @@ def get_for_basic_info(): return jsonable_encoder({ "flag": flagForBasicInfo, "result": { - "id": "Ace", - "familyHistory": "心臟病, 高血壓, 糖尿病", "weight": "60", - "age": "18", "height": "180" } }) From 46a6bf5706414eaef83f2a23ced0b68c47dcd8eb Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 20:18:22 +0800 Subject: [PATCH 091/164] test clinic --- src/main.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index b751ad0..1cee969 100644 --- a/src/main.py +++ b/src/main.py @@ -216,7 +216,10 @@ def post_for_clinic(clinic: ClinicModel): user_data = {} # Prepare the final result result = { - "result": user_data['result'] + "userID":"Ace", + "是否需要檢驗":"0", + "診斷結果": "發炎, 開立消炎藥" + } return jsonable_encoder(result) From 53c6b65f89c7bbdef899cc9e63996a2f4f0235d2 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 21:03:17 +0800 Subject: [PATCH 092/164] test double result --- src/main.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main.py b/src/main.py index 1cee969..fb45287 100644 --- a/src/main.py +++ b/src/main.py @@ -216,10 +216,11 @@ def post_for_clinic(clinic: ClinicModel): user_data = {} # Prepare the final result result = { - "userID":"Ace", - "是否需要檢驗":"0", - "診斷結果": "發炎, 開立消炎藥" - + result:{ + "userID":"Ace", + "是否需要檢驗":"0", + "診斷結果": "發炎, 開立消炎藥" + } } return jsonable_encoder(result) From e7ec5564dcddd650a52c6b1b3014f2f6472edbe9 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 21:05:21 +0800 Subject: [PATCH 093/164] debug --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index fb45287..f8c0253 100644 --- a/src/main.py +++ b/src/main.py @@ -216,7 +216,7 @@ def post_for_clinic(clinic: ClinicModel): user_data = {} # Prepare the final result result = { - result:{ + "result":{ "userID":"Ace", "是否需要檢驗":"0", "診斷結果": "發炎, 開立消炎藥" From 7f043ed939cd2b346d9eb69c90cd4c954ee217b9 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 21:15:31 +0800 Subject: [PATCH 094/164] userid --- src/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.py b/src/main.py index f8c0253..2044834 100644 --- a/src/main.py +++ b/src/main.py @@ -217,9 +217,9 @@ def post_for_clinic(clinic: ClinicModel): # Prepare the final result result = { "result":{ - "userID":"Ace", - "是否需要檢驗":"0", - "診斷結果": "發炎, 開立消炎藥" + "userID":userid, + "是否需要檢驗":"", + "診斷結果": "" } } From 5f06cb0d51a9a9bf306d7677244453a4c402e2ec Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 21:37:33 +0800 Subject: [PATCH 095/164] records --- src/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main.py b/src/main.py index 2044834..e9ccd04 100644 --- a/src/main.py +++ b/src/main.py @@ -246,8 +246,9 @@ def post_for_records(records: RecordsModel): # Prepare the final result result = { - "flag": flag, - "result": user_data['result'] + "result": {userid, + user_data['result'] + } } From 263ce6fd5307c895b1dcb72b257ebefd7ff85662 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 21:44:54 +0800 Subject: [PATCH 096/164] records --- src/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.py b/src/main.py index e9ccd04..6bb9ffe 100644 --- a/src/main.py +++ b/src/main.py @@ -245,10 +245,10 @@ def post_for_records(records: RecordsModel): user_data = {} # Prepare the final result + user_data['result']['userID']=userid + result = { - "result": {userid, - user_data['result'] - } + "result":user_data['result'] } From d09447b548783bf4a835277de6a53172d8591221 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 22:55:03 +0800 Subject: [PATCH 097/164] clinic --- src/main.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main.py b/src/main.py index 6bb9ffe..54619a0 100644 --- a/src/main.py +++ b/src/main.py @@ -218,9 +218,12 @@ def post_for_clinic(clinic: ClinicModel): result = { "result":{ "userID":userid, - "是否需要檢驗":"", - "診斷結果": "" + "clinic":{ + "是否需要檢驗":"", + "診斷結果": "" + } } + } return jsonable_encoder(result) From e07547837159d4ea028bc3d07d543a7e63ed5acd Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 23:36:53 +0800 Subject: [PATCH 098/164] for update --- src/main.py | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/src/main.py b/src/main.py index 54619a0..62eebe1 100644 --- a/src/main.py +++ b/src/main.py @@ -218,10 +218,7 @@ def post_for_clinic(clinic: ClinicModel): result = { "result":{ "userID":userid, - "clinic":{ - "是否需要檢驗":"", - "診斷結果": "" - } + "clinic":user_data } } @@ -265,7 +262,7 @@ def post_next_step(next_step: NextStepModel): return "OK" -@app.get("/FakeBasicInfo") +@app.get("/fakeBasicInfo") def get_for_basic_info(): return jsonable_encoder({ "flag": flagForBasicInfo, @@ -274,3 +271,31 @@ def get_for_basic_info(): "height": "180" } }) + +class updateDataModel(BaseModel): + clinicData: str + userID: str + +@app.post("/updateTestInfo") +def post_for_update_test_info(updateDate: updateDataModel): + + data = {'userid': updateDate.userID} + # Send a POST request + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessbasic', data=data) + # Extract data from the response + if response.status_code == 200: + user_data = response.json() + else: + user_data = {} + + user_data['result']['record'] = updateDate.clinicData + + response2 = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/basic', data=user_data) + # Extract data from the response + if response.status_code == 200: + user_data = response.json() + else: + user_data = {} + + return "OK" + From cfb2e272239e72890d43f8942d7d5ce66771b7c1 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 23:39:53 +0800 Subject: [PATCH 099/164] debug update --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 62eebe1..1955951 100644 --- a/src/main.py +++ b/src/main.py @@ -289,7 +289,7 @@ def post_for_update_test_info(updateDate: updateDataModel): user_data = {} user_data['result']['record'] = updateDate.clinicData - + user_data['result']['userid'] = updateDate.userID response2 = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/basic', data=user_data) # Extract data from the response if response.status_code == 200: From e4484d17347d6ca40b0989b5f5b2f0a48eba9def Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 23:46:26 +0800 Subject: [PATCH 100/164] debug update --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 1955951..56a0133 100644 --- a/src/main.py +++ b/src/main.py @@ -290,7 +290,7 @@ def post_for_update_test_info(updateDate: updateDataModel): user_data['result']['record'] = updateDate.clinicData user_data['result']['userid'] = updateDate.userID - response2 = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/basic', data=user_data) + response2 = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/basic', data=user_data['result']) # Extract data from the response if response.status_code == 200: user_data = response.json() From 03fca95e0ec435d742e96ff7a4522da4f11f3b55 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 23:48:57 +0800 Subject: [PATCH 101/164] for test --- src/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main.py b/src/main.py index 56a0133..fb999cb 100644 --- a/src/main.py +++ b/src/main.py @@ -287,15 +287,16 @@ def post_for_update_test_info(updateDate: updateDataModel): user_data = response.json() else: user_data = {} + return "get fail" user_data['result']['record'] = updateDate.clinicData user_data['result']['userid'] = updateDate.userID response2 = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/basic', data=user_data['result']) # Extract data from the response if response.status_code == 200: - user_data = response.json() + return "OK" else: user_data = {} + return "update fail" - return "OK" From 7996f148c331d4d7219db6afe33acbaa1f5d76fc Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 23:52:35 +0800 Subject: [PATCH 102/164] 123 --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index fb999cb..6a7d334 100644 --- a/src/main.py +++ b/src/main.py @@ -294,7 +294,7 @@ def post_for_update_test_info(updateDate: updateDataModel): response2 = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/basic', data=user_data['result']) # Extract data from the response if response.status_code == 200: - return "OK" + return updateDate.userID else: user_data = {} return "update fail" From 0a9209d79752c4410880ede37d24d3349f527b1e Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 23:54:18 +0800 Subject: [PATCH 103/164] 234 --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 6a7d334..c41f152 100644 --- a/src/main.py +++ b/src/main.py @@ -287,7 +287,7 @@ def post_for_update_test_info(updateDate: updateDataModel): user_data = response.json() else: user_data = {} - return "get fail" + return updateDate.userID user_data['result']['record'] = updateDate.clinicData user_data['result']['userid'] = updateDate.userID From e7fefd989f659799a9b3a53697c71f62da8cdce6 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 23:55:45 +0800 Subject: [PATCH 104/164] 2222 --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index c41f152..dbc1c6a 100644 --- a/src/main.py +++ b/src/main.py @@ -294,7 +294,7 @@ def post_for_update_test_info(updateDate: updateDataModel): response2 = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/basic', data=user_data['result']) # Extract data from the response if response.status_code == 200: - return updateDate.userID + return updateDate.userID+"fa" else: user_data = {} return "update fail" From b082973f5710ff5ba72a2a3f302b1de90d9e3655 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 20 Jun 2023 23:58:23 +0800 Subject: [PATCH 105/164] dddd --- src/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index dbc1c6a..82ae980 100644 --- a/src/main.py +++ b/src/main.py @@ -279,7 +279,8 @@ class updateDataModel(BaseModel): @app.post("/updateTestInfo") def post_for_update_test_info(updateDate: updateDataModel): - data = {'userid': updateDate.userID} + userID = "Ue1350bef1851afd418a9aa81e444eaa7" + data = {'userid': userID} # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessbasic', data=data) # Extract data from the response From 0623f2184412dd4117f8eddee540e95a75110a6c Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 00:00:13 +0800 Subject: [PATCH 106/164] 3333 --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 82ae980..61cc1c4 100644 --- a/src/main.py +++ b/src/main.py @@ -291,7 +291,7 @@ def post_for_update_test_info(updateDate: updateDataModel): return updateDate.userID user_data['result']['record'] = updateDate.clinicData - user_data['result']['userid'] = updateDate.userID + user_data['result']['userid'] = userID response2 = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/basic', data=user_data['result']) # Extract data from the response if response.status_code == 200: From 3d3ac92c293c03db176fcec6bc15035d30a23e65 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 00:03:21 +0800 Subject: [PATCH 107/164] 11111 --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 61cc1c4..0c54b51 100644 --- a/src/main.py +++ b/src/main.py @@ -295,7 +295,7 @@ def post_for_update_test_info(updateDate: updateDataModel): response2 = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/basic', data=user_data['result']) # Extract data from the response if response.status_code == 200: - return updateDate.userID+"fa" + return data else: user_data = {} return "update fail" From 07fa7e7785d0b4526bc47ce3768dc0fb6b8408c5 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 00:04:59 +0800 Subject: [PATCH 108/164] 123123 --- src/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.py b/src/main.py index 0c54b51..2e83b9c 100644 --- a/src/main.py +++ b/src/main.py @@ -288,14 +288,14 @@ def post_for_update_test_info(updateDate: updateDataModel): user_data = response.json() else: user_data = {} - return updateDate.userID + return updateDate.userID+"11" user_data['result']['record'] = updateDate.clinicData user_data['result']['userid'] = userID response2 = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/basic', data=user_data['result']) # Extract data from the response if response.status_code == 200: - return data + return user_data['result'] else: user_data = {} return "update fail" From 0991d983d59b3c49b87c0c5a458c2b1fcdc79cbe Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 00:12:32 +0800 Subject: [PATCH 109/164] debug --- src/main.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main.py b/src/main.py index 2e83b9c..46a594a 100644 --- a/src/main.py +++ b/src/main.py @@ -288,14 +288,17 @@ def post_for_update_test_info(updateDate: updateDataModel): user_data = response.json() else: user_data = {} - return updateDate.userID+"11" - - user_data['result']['record'] = updateDate.clinicData - user_data['result']['userid'] = userID - response2 = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/basic', data=user_data['result']) + return updateDate.userID + info_key_mapping = {"姓名":"name", "性別":"gender", "年齡": "age", "身高": "height", "體重": "weight", "家族病史": "family", "個人病史": "record"} + send_user_data = {} + send_user_data['record'] = updateDate.clinicData + send_user_data['userid'] = userID + for i in user_data['result']: + send_user_data[info_key_mapping[i]] = user_data['result'][i] + response2 = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/basic', data=send_user_data) # Extract data from the response if response.status_code == 200: - return user_data['result'] + return send_user_data else: user_data = {} return "update fail" From 7395371e4c0d730ca2abaf6ffb4cf0880803e1c4 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 00:14:43 +0800 Subject: [PATCH 110/164] 4444 --- src/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 46a594a..9c461ac 100644 --- a/src/main.py +++ b/src/main.py @@ -291,8 +291,9 @@ def post_for_update_test_info(updateDate: updateDataModel): return updateDate.userID info_key_mapping = {"姓名":"name", "性別":"gender", "年齡": "age", "身高": "height", "體重": "weight", "家族病史": "family", "個人病史": "record"} send_user_data = {} - send_user_data['record'] = updateDate.clinicData send_user_data['userid'] = userID + send_user_data['record'] = updateDate.clinicData + for i in user_data['result']: send_user_data[info_key_mapping[i]] = user_data['result'][i] response2 = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/basic', data=send_user_data) From c29389df922fa3bc1dce5bac5b2d417e39d03e7f Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 00:21:51 +0800 Subject: [PATCH 111/164] 3333333 --- src/main.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main.py b/src/main.py index 9c461ac..7dbee75 100644 --- a/src/main.py +++ b/src/main.py @@ -290,12 +290,22 @@ def post_for_update_test_info(updateDate: updateDataModel): user_data = {} return updateDate.userID info_key_mapping = {"姓名":"name", "性別":"gender", "年齡": "age", "身高": "height", "體重": "weight", "家族病史": "family", "個人病史": "record"} - send_user_data = {} - send_user_data['userid'] = userID - send_user_data['record'] = updateDate.clinicData - for i in user_data['result']: - send_user_data[info_key_mapping[i]] = user_data['result'][i] + # send_user_data = {} + # send_user_data['userid'] = userID + # send_user_data['record'] = updateDate.clinicData + # for i in user_data['result']: + # send_user_data[info_key_mapping[i]] = user_data['result'][i] + send_user_data={ + "userid": "Ue1350bef1851afd418a9aa81e444eaa7", + "record": "3333", + "gender": "男", + "name": "李小明", + "weight": "75", + "family": "肝癌, 糖尿病", + "height": "180", + "age": "20" +} response2 = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/basic', data=send_user_data) # Extract data from the response if response.status_code == 200: From 7bd9aa9305f59586cb0b91e1c5e87bb24ef4a64e Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 00:28:07 +0800 Subject: [PATCH 112/164] RRRRRRRRRRRRRRRRRRRRRR --- src/main.py | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/main.py b/src/main.py index 7dbee75..7c37c4c 100644 --- a/src/main.py +++ b/src/main.py @@ -279,8 +279,7 @@ class updateDataModel(BaseModel): @app.post("/updateTestInfo") def post_for_update_test_info(updateDate: updateDataModel): - userID = "Ue1350bef1851afd418a9aa81e444eaa7" - data = {'userid': userID} + data = {'userid': updateDate.userID} # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessbasic', data=data) # Extract data from the response @@ -291,21 +290,13 @@ def post_for_update_test_info(updateDate: updateDataModel): return updateDate.userID info_key_mapping = {"姓名":"name", "性別":"gender", "年齡": "age", "身高": "height", "體重": "weight", "家族病史": "family", "個人病史": "record"} - # send_user_data = {} - # send_user_data['userid'] = userID - # send_user_data['record'] = updateDate.clinicData - # for i in user_data['result']: - # send_user_data[info_key_mapping[i]] = user_data['result'][i] - send_user_data={ - "userid": "Ue1350bef1851afd418a9aa81e444eaa7", - "record": "3333", - "gender": "男", - "name": "李小明", - "weight": "75", - "family": "肝癌, 糖尿病", - "height": "180", - "age": "20" -} + send_user_data = {} + + for i in user_data['result']: + send_user_data[info_key_mapping[i]] = user_data['result'][i] + send_user_data['userid'] = updateDate.userID + send_user_data['record'] = updateDate.clinicData + response2 = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/basic', data=send_user_data) # Extract data from the response if response.status_code == 200: From d949480f5b12a3c3bf6b5b4401e54e296816e3e8 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 13:49:29 +0800 Subject: [PATCH 113/164] change var --- src/main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main.py b/src/main.py index 7c37c4c..5bcf0b5 100644 --- a/src/main.py +++ b/src/main.py @@ -276,10 +276,10 @@ class updateDataModel(BaseModel): clinicData: str userID: str -@app.post("/updateTestInfo") -def post_for_update_test_info(updateDate: updateDataModel): +@app.post("/updateClinic") +def post_for_update_clinic(updateData: updateDataModel): - data = {'userid': updateDate.userID} + data = {'userid': updateData.userID} # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessbasic', data=data) # Extract data from the response @@ -287,15 +287,15 @@ def post_for_update_test_info(updateDate: updateDataModel): user_data = response.json() else: user_data = {} - return updateDate.userID + return updateData.userID info_key_mapping = {"姓名":"name", "性別":"gender", "年齡": "age", "身高": "height", "體重": "weight", "家族病史": "family", "個人病史": "record"} send_user_data = {} for i in user_data['result']: send_user_data[info_key_mapping[i]] = user_data['result'][i] - send_user_data['userid'] = updateDate.userID - send_user_data['record'] = updateDate.clinicData + send_user_data['userid'] = updateData.userID + send_user_data['record'] = updateData.clinicData response2 = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/basic', data=send_user_data) # Extract data from the response From 7f3f12e3887778b2a2a1e5b1086d11460efe294a Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 15:52:08 +0800 Subject: [PATCH 114/164] for clinic --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 5bcf0b5..0dd62dc 100644 --- a/src/main.py +++ b/src/main.py @@ -215,9 +215,9 @@ def post_for_clinic(clinic: ClinicModel): else: user_data = {} # Prepare the final result + user_data["userID"] = userid result = { "result":{ - "userID":userid, "clinic":user_data } From 434538922af3d2f507ad1123c83428e324a223e3 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 15:57:01 +0800 Subject: [PATCH 115/164] debug --- src/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.py b/src/main.py index 0dd62dc..07ce00a 100644 --- a/src/main.py +++ b/src/main.py @@ -215,10 +215,10 @@ def post_for_clinic(clinic: ClinicModel): else: user_data = {} # Prepare the final result - user_data["userID"] = userid + user_data["result"]["userID"] = userid result = { "result":{ - "clinic":user_data + user_data["result"] } } From 3d19cce1e0f0ce3a55d22c6fe3b27673d55ec759 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 16:09:33 +0800 Subject: [PATCH 116/164] test clinic --- src/main.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main.py b/src/main.py index 07ce00a..35d71ad 100644 --- a/src/main.py +++ b/src/main.py @@ -217,10 +217,8 @@ def post_for_clinic(clinic: ClinicModel): # Prepare the final result user_data["result"]["userID"] = userid result = { - "result":{ - user_data["result"] - } - + "result":user_data["result"] + } return jsonable_encoder(result) From c2b7c09c633d440ff5793004719ebe360ea05ef2 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 16:38:07 +0800 Subject: [PATCH 117/164] test clinic tem --- src/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.py b/src/main.py index 35d71ad..1ed6d8f 100644 --- a/src/main.py +++ b/src/main.py @@ -147,8 +147,8 @@ def post_for_symptoms(symptoms: SymptomsModel): } # Prepare the data data1 = {'userid': userid, - 'returns': "否", - 'diagnosis': "發炎, 開立消炎藥"} + 'returns': "1", + 'diagnosis': ""} # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/diagnosis', data=data1) # Prepare the data From f2c2f983786af63b31486497e9bcc67a8531fec2 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 16:43:33 +0800 Subject: [PATCH 118/164] 123 --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 1ed6d8f..f045b5d 100644 --- a/src/main.py +++ b/src/main.py @@ -147,7 +147,7 @@ def post_for_symptoms(symptoms: SymptomsModel): } # Prepare the data data1 = {'userid': userid, - 'returns': "1", + 'returns': "", 'diagnosis': ""} # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/diagnosis', data=data1) From 7739db69c98b325a32921abd7fdcae30b02f8c7a Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 17:21:19 +0800 Subject: [PATCH 119/164] clinic return --- src/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.py b/src/main.py index f045b5d..6c956da 100644 --- a/src/main.py +++ b/src/main.py @@ -217,6 +217,7 @@ def post_for_clinic(clinic: ClinicModel): # Prepare the final result user_data["result"]["userID"] = userid result = { + "userID":userid, "result":user_data["result"] } From df8e4dcea5ef72184e7d1e0c65b03b112dd2bc2b Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 17:22:28 +0800 Subject: [PATCH 120/164] delete userID --- src/main.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main.py b/src/main.py index 6c956da..871825f 100644 --- a/src/main.py +++ b/src/main.py @@ -215,7 +215,6 @@ def post_for_clinic(clinic: ClinicModel): else: user_data = {} # Prepare the final result - user_data["result"]["userID"] = userid result = { "userID":userid, "result":user_data["result"] From fe92022a72213c0a2ec7e60bb8885a5268dff786 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 18:24:27 +0800 Subject: [PATCH 121/164] TEST --- src/main.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 871825f..02ddb43 100644 --- a/src/main.py +++ b/src/main.py @@ -209,15 +209,18 @@ def post_for_clinic(clinic: ClinicModel): data = {'userid': userid} # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessdiagnosis', data=data) + data_for_result = {} # Extract data from the response if response.status_code == 200: user_data = response.json() + else: user_data = {} + return "erro" # Prepare the final result result = { "userID":userid, - "result":user_data["result"] + "result":{user_data["result"]} } From c55aa87e04ed5bc3c9872ce4b9d915d298adafc1 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 18:27:09 +0800 Subject: [PATCH 122/164] ttttt --- src/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 02ddb43..bb8d743 100644 --- a/src/main.py +++ b/src/main.py @@ -201,6 +201,7 @@ def post_for_symptoms(symptoms: SymptomsModel): class ClinicModel(BaseModel): userID: str + @app.post("/forClinic") def post_for_clinic(clinic: ClinicModel): userid = clinic.userID @@ -224,7 +225,7 @@ def post_for_clinic(clinic: ClinicModel): } - return jsonable_encoder(result) + return jsonable_encoder(user_data["result"]) class RecordsModel(BaseModel): From 1e49e4b52783c8deeec76ece43559dff319e15e0 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 18:30:32 +0800 Subject: [PATCH 123/164] ttttttttttttttt --- src/main.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main.py b/src/main.py index bb8d743..ba5850f 100644 --- a/src/main.py +++ b/src/main.py @@ -202,6 +202,8 @@ def post_for_symptoms(symptoms: SymptomsModel): class ClinicModel(BaseModel): userID: str +class ClinicModel(BaseModel): + userID: str @app.post("/forClinic") def post_for_clinic(clinic: ClinicModel): userid = clinic.userID @@ -210,22 +212,21 @@ def post_for_clinic(clinic: ClinicModel): data = {'userid': userid} # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessdiagnosis', data=data) - data_for_result = {} # Extract data from the response if response.status_code == 200: user_data = response.json() - else: user_data = {} - return "erro" # Prepare the final result result = { - "userID":userid, - "result":{user_data["result"]} - + "result":{ + "userID":userid, + "clinic":user_data + } + } - return jsonable_encoder(user_data["result"]) + return jsonable_encoder(result) class RecordsModel(BaseModel): From 1ed91665281bb5b09b05aafee5bbf722598e8f9f Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 18:40:12 +0800 Subject: [PATCH 124/164] zzzzzzzzzzzzzzzzzzzzzzzzzzzz --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index ba5850f..9e6c0e2 100644 --- a/src/main.py +++ b/src/main.py @@ -221,7 +221,7 @@ def post_for_clinic(clinic: ClinicModel): result = { "result":{ "userID":userid, - "clinic":user_data + "clinic":user_data[result] } } From 1858e14fef75d7985020ac7f3c3d983a0d82bf30 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 18:44:00 +0800 Subject: [PATCH 125/164] test R --- src/main.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main.py b/src/main.py index 9e6c0e2..c332284 100644 --- a/src/main.py +++ b/src/main.py @@ -215,18 +215,20 @@ def post_for_clinic(clinic: ClinicModel): # Extract data from the response if response.status_code == 200: user_data = response.json() - else: - user_data = {} - # Prepare the final result - result = { - "result":{ + result = { + "result":{ "userID":userid, "clinic":user_data[result] } } - return jsonable_encoder(result) + return jsonable_encoder(result) + else: + user_data = {} + return "R" + # Prepare the final result + class RecordsModel(BaseModel): From e09ed83666ef63d77cc63b713c359979b5e1c184 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 18:44:40 +0800 Subject: [PATCH 126/164] testRRR --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index c332284..8811eb0 100644 --- a/src/main.py +++ b/src/main.py @@ -223,7 +223,7 @@ def post_for_clinic(clinic: ClinicModel): } - return jsonable_encoder(result) + return jsonable_encoder(user_data[result]) else: user_data = {} return "R" From d0217984e0bd9881f7b8aab6c28764c0eca82fb4 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 18:56:18 +0800 Subject: [PATCH 127/164] 2132 --- src/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.py b/src/main.py index 8811eb0..6c9efdc 100644 --- a/src/main.py +++ b/src/main.py @@ -218,10 +218,10 @@ def post_for_clinic(clinic: ClinicModel): result = { "result":{ "userID":userid, - "clinic":user_data[result] - } + "clinic":user_data["result"] + } - } + } return jsonable_encoder(user_data[result]) else: From 7a0cc6b3ef960e21db1e0c258ff5cf8873dffa77 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 18:58:55 +0800 Subject: [PATCH 128/164] bookfish --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 6c9efdc..50696be 100644 --- a/src/main.py +++ b/src/main.py @@ -223,7 +223,7 @@ def post_for_clinic(clinic: ClinicModel): } - return jsonable_encoder(user_data[result]) + return jsonable_encoder(result) else: user_data = {} return "R" From b0187f61d085b7089a6aaf85a3c02588fd3d503d Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 21:12:18 +0800 Subject: [PATCH 129/164] ssssssssssss --- src/main.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main.py b/src/main.py index 50696be..aee636d 100644 --- a/src/main.py +++ b/src/main.py @@ -216,11 +216,7 @@ def post_for_clinic(clinic: ClinicModel): if response.status_code == 200: user_data = response.json() result = { - "result":{ - "userID":userid, - "clinic":user_data["result"] - } - + user_data["result"] } return jsonable_encoder(result) From a171e34ebd8321d7a2c2900f6ba71bfbad1cf37e Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 21:13:18 +0800 Subject: [PATCH 130/164] ssssssssssssss --- src/main.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main.py b/src/main.py index aee636d..ae19ed0 100644 --- a/src/main.py +++ b/src/main.py @@ -215,9 +215,8 @@ def post_for_clinic(clinic: ClinicModel): # Extract data from the response if response.status_code == 200: user_data = response.json() - result = { - user_data["result"] - } + result = user_data["result"] + return jsonable_encoder(result) else: From 5a3ab89d2ceb300de16764e0f0a4424c0c82b205 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 21:14:58 +0800 Subject: [PATCH 131/164] sssssssssssssssssssss --- src/main.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index ae19ed0..50696be 100644 --- a/src/main.py +++ b/src/main.py @@ -215,8 +215,13 @@ def post_for_clinic(clinic: ClinicModel): # Extract data from the response if response.status_code == 200: user_data = response.json() - result = user_data["result"] + result = { + "result":{ + "userID":userid, + "clinic":user_data["result"] + } + } return jsonable_encoder(result) else: From 1ab4d5ac760713e82813d37535c88f7886edbd97 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 23:05:57 +0800 Subject: [PATCH 132/164] Wait --- src/main.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main.py b/src/main.py index 50696be..966dc4a 100644 --- a/src/main.py +++ b/src/main.py @@ -266,14 +266,17 @@ class NextStepModel(BaseModel): def post_next_step(next_step: NextStepModel): return "OK" +class waitModel(BaseModel): + userid : str + +@app.post("/wait") +def wait(wait: waitModel): -@app.get("/fakeBasicInfo") -def get_for_basic_info(): + + return jsonable_encoder({ - "flag": flagForBasicInfo, "result": { - "weight": "60", - "height": "180" + "userID": wait.userid } }) From de0aeff7418db9500659d83c12cc890f4e71bd5f Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 23:16:24 +0800 Subject: [PATCH 133/164] ID --- src/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.py b/src/main.py index 966dc4a..ed0f497 100644 --- a/src/main.py +++ b/src/main.py @@ -267,16 +267,16 @@ def post_next_step(next_step: NextStepModel): return "OK" class waitModel(BaseModel): - userid : str + userID : str @app.post("/wait") def wait(wait: waitModel): - + return jsonable_encoder({ "result": { - "userID": wait.userid + "userID": wait.userID } }) From 6ffd8faf42f99578714f54bbc3041e4dc9027074 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 23:44:18 +0800 Subject: [PATCH 134/164] symptoms delte --- src/main.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main.py b/src/main.py index ed0f497..6d8481f 100644 --- a/src/main.py +++ b/src/main.py @@ -142,8 +142,7 @@ def post_for_symptoms(symptoms: SymptomsModel): # Prepare the final result result = { - 'flag': flag, - 'result': user_data['result'] + user_data['result'] } # Prepare the data data1 = {'userid': userid, @@ -190,17 +189,12 @@ def post_for_symptoms(symptoms: SymptomsModel): time.sleep(0.2) else: result = { - "flag":0, - "result":{ "symptoms":"" - } } return jsonable_encoder(result) -class ClinicModel(BaseModel): - userID: str class ClinicModel(BaseModel): userID: str From a0bb2f8791a9d45bedcedcd4b928a8ab16706152 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Wed, 21 Jun 2023 23:50:59 +0800 Subject: [PATCH 135/164] delte symptoms' flag --- src/main.py | 101 ++++++++++++++++++++++------------------------------ 1 file changed, 42 insertions(+), 59 deletions(-) diff --git a/src/main.py b/src/main.py index 6d8481f..a6fa132 100644 --- a/src/main.py +++ b/src/main.py @@ -128,69 +128,52 @@ class SymptomsModel(BaseModel): def post_for_symptoms(symptoms: SymptomsModel): userid = symptoms.userID - flag = flagForSymptoms # Prepare the data data = {'userid': userid} - if flagForSymptoms == 1: # Send a POST request - response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accesssymptoms', data=data) - # Extract data from the response - if response.status_code == 200: - user_data = response.json() - else: - user_data = {} - # Prepare the final result - - result = { - user_data['result'] - } - # Prepare the data - data1 = {'userid': userid, - 'returns': "", - 'diagnosis': ""} - # Send a POST request - response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/diagnosis', data=data1) - # Prepare the data - data2 = { - 'userid': userid, - "urineprotein": "-", - "urineob": "-", - "urineglucose": "-", - "bloodhb": "15", - "bloodht": "45", - "bloodplt": "30", - "bloodpressure": "73-124", - "bloodrbc": "500", - "bloodwbc": "5500 %", - "cholesterol": "150", - "hbeag": "-", - "hbsab": "-", - "hbsag": "-", - "kidneybun": "15", - "liversgot": "25", - "liversgpt": "30", - "kidneycre": "0.7" - } - # Send a POST request - response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/testinfo', data=data2) - changeFlag = { - "target": "flagForSymptoms", - "val": 0 - } - - for i in range(5): - # Send a POST request - response = requests.post(urlForChange, json=changeFlag) - # Extract data from the response - if response.status_code == 200: - user_data = response.json() - else: - user_data = {} - time.sleep(0.2) + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accesssymptoms', data=data) + # Extract data from the response + if response.status_code == 200: + user_data = response.json() else: - result = { - "symptoms":"" - } + user_data = {} + # Prepare the final result + + result = { + user_data['result'] + } + # Prepare the data + data1 = {'userid': userid, + 'returns': "", + 'diagnosis': ""} + # Send a POST request + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/diagnosis', data=data1) + # Prepare the data + data2 = { + 'userid': userid, + "urineprotein": "-", + "urineob": "-", + "urineglucose": "-", + "bloodhb": "15", + "bloodht": "45", + "bloodplt": "30", + "bloodpressure": "73-124", + "bloodrbc": "500", + "bloodwbc": "5500 %", + "cholesterol": "150", + "hbeag": "-", + "hbsab": "-", + "hbsag": "-", + "kidneybun": "15", + "liversgot": "25", + "liversgpt": "30", + "kidneycre": "0.7" + } + # Send a POST request + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/testinfo', data=data2) + + + return jsonable_encoder(result) From 7fbd9c4354219f164b116e385f52560c5384e4d6 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Thu, 22 Jun 2023 00:01:53 +0800 Subject: [PATCH 136/164] debug symptos --- src/main.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main.py b/src/main.py index a6fa132..3c42cce 100644 --- a/src/main.py +++ b/src/main.py @@ -138,7 +138,6 @@ def post_for_symptoms(symptoms: SymptomsModel): else: user_data = {} # Prepare the final result - result = { user_data['result'] } @@ -148,6 +147,11 @@ def post_for_symptoms(symptoms: SymptomsModel): 'diagnosis': ""} # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/diagnosis', data=data1) + if response.status_code == 200: + data1 = {} + else: + return "post_diagnoss_error"\ + # Prepare the data data2 = { 'userid': userid, @@ -171,7 +175,10 @@ def post_for_symptoms(symptoms: SymptomsModel): } # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/testinfo', data=data2) - + if response.status_code == 200: + data2 = {} + else: + return "post_testinfo_error" From 298c6991abd635dd6ff4b350cd7b8d99e036e169 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Thu, 22 Jun 2023 00:12:47 +0800 Subject: [PATCH 137/164] debug --- src/main.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main.py b/src/main.py index 3c42cce..a9db74a 100644 --- a/src/main.py +++ b/src/main.py @@ -138,9 +138,8 @@ def post_for_symptoms(symptoms: SymptomsModel): else: user_data = {} # Prepare the final result - result = { - user_data['result'] - } + result = user_data['result'] + # Prepare the data data1 = {'userid': userid, 'returns': "", @@ -150,7 +149,7 @@ def post_for_symptoms(symptoms: SymptomsModel): if response.status_code == 200: data1 = {} else: - return "post_diagnoss_error"\ + return "post_diagnoss_error" # Prepare the data data2 = { From d1d842d4785e1f69927c136f5cb3bad24784c813 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Thu, 22 Jun 2023 00:32:22 +0800 Subject: [PATCH 138/164] for clinic --- src/main.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main.py b/src/main.py index a9db74a..4077f59 100644 --- a/src/main.py +++ b/src/main.py @@ -198,13 +198,10 @@ def post_for_clinic(clinic: ClinicModel): # Extract data from the response if response.status_code == 200: user_data = response.json() - result = { - "result":{ - "userID":userid, - "clinic":user_data["result"] - } + user_data["result"]["userID"]=userid + result = user_data["result"] + - } return jsonable_encoder(result) else: From ab27a4f27aab9fab481e47c0e1852e4499ff0858 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Thu, 22 Jun 2023 00:39:24 +0800 Subject: [PATCH 139/164] change result --- src/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.py b/src/main.py index 4077f59..7f68104 100644 --- a/src/main.py +++ b/src/main.py @@ -199,9 +199,9 @@ def post_for_clinic(clinic: ClinicModel): if response.status_code == 200: user_data = response.json() user_data["result"]["userID"]=userid - result = user_data["result"] - - + result = { + "result":user_data["result"] + } return jsonable_encoder(result) else: From 5ee6e44d042d7060df5b50534db9ed3c113f582b Mon Sep 17 00:00:00 2001 From: jack80806 Date: Thu, 22 Jun 2023 01:45:37 +0800 Subject: [PATCH 140/164] del flag --- src/main.py | 93 +---------------------------------------------------- 1 file changed, 1 insertion(+), 92 deletions(-) diff --git a/src/main.py b/src/main.py index 7f68104..bc22350 100644 --- a/src/main.py +++ b/src/main.py @@ -8,85 +8,9 @@ app = FastAPI() -# Global variables -flagForSymptoms: Optional[int] = 0 -flagForBasicInfo: Optional[int] = 0 -flagForRecords: Optional[int] = 1 -flagForClinic: Optional[int] = 1 - -urlForChange= "https://for-api-32f276cf322d.herokuapp.com/changeFlag" - -class FlagModel(BaseModel): - target: str - val: int - - - -@app.post("/changeFlag") -def post_for_change_flag(flag: FlagModel): - global flagForSymptoms - global flagForBasicInfo - global flagForRecords - global flagForClinic - - if flag.target == "flagForSymptoms": - flagForSymptoms = flag.val - return "OK" - - elif flag.target == "flagForBasicInfo": - flagForBasicInfo = flag.val - return "OK" - - elif flag.target == "flagForRecords": - flagForRecords = flag.val - return "OK" - - elif flag.target == "flagForClinic": - flagForClinic = flag.val - return "OK" - - - return "fail" - - - -class AllFlagModel(BaseModel): - flagForSymptoms: int - flagForBasicInfo: int - flagForRecords: int - flagForClinic: int - - -@app.post("/changeAllFlag") -def post_for_change_All_flag(flag: AllFlagModel): - global flagForSymptoms - global flagForBasicInfo - global flagForRecords - global flagForClinic - - flagForSymptoms = flag.flagForSymptoms - flagForBasicInfo = flag.flagForBasicInfo - flagForRecords = flag.flagForRecords - flagForClinic = flag.flagForClinic - - return "OK" - - -@app.get("/getFlag") -def get_for_flag(): - return jsonable_encoder({ - "flagForSymptoms": flagForSymptoms, - "flagForBasicInfo": flagForBasicInfo, - "flagForRecords": flagForRecords, - "flagForClinic": flagForClinic, - - }) - - @app.get("/basicInfo") def get_for_basic_info(): userid = "Ue1350bef1851afd418a9aa81e444eaa7" - flag = flagForBasicInfo # Prepare the data data = {'userid': userid} @@ -101,23 +25,10 @@ def get_for_basic_info(): # Prepare the final result result = { - "flag": flag, "userID":userid, "result": user_data['result'] } - # changeFlag = { - # "target": "flagForBasicInfo", - # "val": 0 - # } - # for i in range(5): - # # Send a POST request - # response = requests.post(urlForChange, json=changeFlag) - # # Extract data from the response - # if response.status_code == 200: - # user_data = response.json() - # else: - # user_data = {} - # time.sleep(0.2) + return jsonable_encoder(result) @@ -190,7 +101,6 @@ class ClinicModel(BaseModel): @app.post("/forClinic") def post_for_clinic(clinic: ClinicModel): userid = clinic.userID - flag = flagForClinic # Prepare the data data = {'userid': userid} # Send a POST request @@ -216,7 +126,6 @@ class RecordsModel(BaseModel): @app.post("/records") def post_for_records(records: RecordsModel): userid = records.userID - flag = flagForRecords # Prepare the data data = {'userid': userid} From 16d1ecd5cb99cf77684ee15192f6e76ce7ebf39c Mon Sep 17 00:00:00 2001 From: jack80806 Date: Thu, 22 Jun 2023 05:03:52 +0800 Subject: [PATCH 141/164] FFFFFFFFFFFFF --- src/main.py | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index bc22350..d666a87 100644 --- a/src/main.py +++ b/src/main.py @@ -4,7 +4,7 @@ from fastapi.encoders import jsonable_encoder from fastapi.responses import JSONResponse import requests -import time +import re app = FastAPI() @@ -202,4 +202,39 @@ def post_for_update_clinic(updateData: updateDataModel): user_data = {} return "update fail" +class isReturnModel(BaseModel): + message: str + userID: str + +@app.post("/isReturn") +def post_for_isReturn(isReturn: isReturnModel): + data = isReturn.message + + score = [int(i) for i in re.findall(r'\d+', data)] + return score + +class messageModel(BaseModel): + userID: str +@app.post("/messages") +def post_for_records(data_messages: messageModel): + userid = data_messages.userID + # Prepare the data + data = {'userid': userid} + + # Send a POST request + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessmessage', data=data) + # Extract data from the response + if response.status_code == 200: + user_data = response.json() + else: + user_data = {} + + # Prepare the final result + user_data['result']['userID']=userid + + result = { + "result":user_data['result'] + } + + return jsonable_encoder(result) From 830d740b14353cf5e9b12d9571be7958d94c80af Mon Sep 17 00:00:00 2001 From: jack80806 Date: Thu, 22 Jun 2023 05:33:35 +0800 Subject: [PATCH 142/164] EEEEEEEEEEEEEEEEEEE --- src/main.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index d666a87..57ae67a 100644 --- a/src/main.py +++ b/src/main.py @@ -209,9 +209,20 @@ class isReturnModel(BaseModel): @app.post("/isReturn") def post_for_isReturn(isReturn: isReturnModel): data = isReturn.message + userid = isReturn.userID score = [int(i) for i in re.findall(r'\d+', data)] - return score + if score > 7: + result = {'message':'請您立即回診', + 'userID': userid} + requests.post('https://i-care-te-st-21770a966fd0.herokuapp.com/external_api', json=result) + return "1" + else: + result = {'message':'您的狀況良好!請繼續保持!OvO', + 'userID': userid} + requests.post('https://i-care-te-st-21770a966fd0.herokuapp.com/external_api', json=result) + return "0" + class messageModel(BaseModel): userID: str From a97b388da3b805c4e6aaccdc01dfd2727c3c0ea3 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Thu, 22 Jun 2023 05:37:40 +0800 Subject: [PATCH 143/164] aaaaaaaaaaaaaaaaaaaa --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 57ae67a..b26fde1 100644 --- a/src/main.py +++ b/src/main.py @@ -212,7 +212,7 @@ def post_for_isReturn(isReturn: isReturnModel): userid = isReturn.userID score = [int(i) for i in re.findall(r'\d+', data)] - if score > 7: + if score[0] > 7: result = {'message':'請您立即回診', 'userID': userid} requests.post('https://i-care-te-st-21770a966fd0.herokuapp.com/external_api', json=result) From 94b96fee611b03386863f423f0f658b641b36890 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Thu, 22 Jun 2023 23:55:17 +0800 Subject: [PATCH 144/164] for multi --- src/main.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/main.py b/src/main.py index b26fde1..e612e3c 100644 --- a/src/main.py +++ b/src/main.py @@ -8,6 +8,27 @@ app = FastAPI() +class multiUserModel(BaseModel): + userID: str +@app.post("/testMultiUser") +def postForMultiUser(multiUser: multiUserModel): + userid = multiUser.userID + sendData = {'userid': "multiUser"} + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessflag', data=sendData) + getData = response.json() + userQueue = getData['result']['flagforuser'] + userQueue.append(userid) + postData = {"userid": userid, + "flagforuser": userQueue, + "flagforsymptom":getData['result']['flagforsymptom'], + "flagfordaily":getData['result']['flagfordaily']} + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/flag', data=postData) + if response.status_code == 200: + return "OK" + else: + return "fail" + + @app.get("/basicInfo") def get_for_basic_info(): userid = "Ue1350bef1851afd418a9aa81e444eaa7" From 19e57caa6add1444aa6c33e59691fe569b62f891 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 23 Jun 2023 00:00:20 +0800 Subject: [PATCH 145/164] 11111111111111 --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index e612e3c..0e10b9a 100644 --- a/src/main.py +++ b/src/main.py @@ -16,7 +16,7 @@ def postForMultiUser(multiUser: multiUserModel): sendData = {'userid': "multiUser"} response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessflag', data=sendData) getData = response.json() - userQueue = getData['result']['flagforuser'] + userQueue = eval(getData['result']['flagforuser']) userQueue.append(userid) postData = {"userid": userid, "flagforuser": userQueue, From 8ea8cdc98a6aa1feb29fb3e1a09d5f8545703b26 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 23 Jun 2023 01:28:43 +0800 Subject: [PATCH 146/164] multiuser --- src/main.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 0e10b9a..8a3bdf7 100644 --- a/src/main.py +++ b/src/main.py @@ -31,7 +31,12 @@ def postForMultiUser(multiUser: multiUserModel): @app.get("/basicInfo") def get_for_basic_info(): - userid = "Ue1350bef1851afd418a9aa81e444eaa7" + + sendData = {'userid': "multiUser"} + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessflag', data=sendData) + getData = response.json() + userQueue = eval(getData['result']['flagforuser']) + userid = userQueue[0] # Prepare the data data = {'userid': userid} @@ -233,6 +238,19 @@ def post_for_isReturn(isReturn: isReturnModel): userid = isReturn.userID score = [int(i) for i in re.findall(r'\d+', data)] + ################ dequeue + ''' + sendData = {'userid': "multiUser"} + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessflag', data=sendData) + getData = response.json() + userQueue = eval(getData['result']['flagforuser']) + userQueue.leftpop() + postData = {"userid": userid, + "flagforuser": userQueue, + "flagforsymptom":getData['result']['flagforsymptom'], + "flagfordaily":getData['result']['flagfordaily']} + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/flag', data=postData) + ''' if score[0] > 7: result = {'message':'請您立即回診', 'userID': userid} From e3c122c9020171dccf1354d9fd321971c36a77ef Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 23 Jun 2023 01:43:22 +0800 Subject: [PATCH 147/164] sssssssssssssss --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 8a3bdf7..5684008 100644 --- a/src/main.py +++ b/src/main.py @@ -18,7 +18,7 @@ def postForMultiUser(multiUser: multiUserModel): getData = response.json() userQueue = eval(getData['result']['flagforuser']) userQueue.append(userid) - postData = {"userid": userid, + postData = {"userid": "multiUser", "flagforuser": userQueue, "flagforsymptom":getData['result']['flagforsymptom'], "flagfordaily":getData['result']['flagfordaily']} From 02a89488fe53d48a5d8390db668f96f14f5e8f5e Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 23 Jun 2023 01:52:21 +0800 Subject: [PATCH 148/164] 123123123 --- src/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 5684008..14d3e6d 100644 --- a/src/main.py +++ b/src/main.py @@ -18,8 +18,9 @@ def postForMultiUser(multiUser: multiUserModel): getData = response.json() userQueue = eval(getData['result']['flagforuser']) userQueue.append(userid) + postData = {"userid": "multiUser", - "flagforuser": userQueue, + "flagforuser": jsonable_encoder(userQueue), "flagforsymptom":getData['result']['flagforsymptom'], "flagfordaily":getData['result']['flagfordaily']} response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/flag', data=postData) From 8a0045a0a6157d35067e726bd463eb2ea510c576 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 23 Jun 2023 01:57:37 +0800 Subject: [PATCH 149/164] xxxxxxxxxxxxxxxxxxxxx --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 14d3e6d..4eba71a 100644 --- a/src/main.py +++ b/src/main.py @@ -18,7 +18,7 @@ def postForMultiUser(multiUser: multiUserModel): getData = response.json() userQueue = eval(getData['result']['flagforuser']) userQueue.append(userid) - + print(jsonable_encoder(userQueue)) postData = {"userid": "multiUser", "flagforuser": jsonable_encoder(userQueue), "flagforsymptom":getData['result']['flagforsymptom'], From 4741feb3a264df11ebf881cde4d87aae29c3c6a8 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 23 Jun 2023 02:00:41 +0800 Subject: [PATCH 150/164] sssssssssssssssssssssss --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 4eba71a..008b697 100644 --- a/src/main.py +++ b/src/main.py @@ -20,7 +20,7 @@ def postForMultiUser(multiUser: multiUserModel): userQueue.append(userid) print(jsonable_encoder(userQueue)) postData = {"userid": "multiUser", - "flagforuser": jsonable_encoder(userQueue), + "flagforuser": "'"+jsonable_encoder(userQueue)+"'", "flagforsymptom":getData['result']['flagforsymptom'], "flagfordaily":getData['result']['flagfordaily']} response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/flag', data=postData) From b9bd337692bc74cfa8946a9835a500d5cbbc5d3c Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 23 Jun 2023 14:02:19 +0800 Subject: [PATCH 151/164] multi OK --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 07d25a4..8a01b1c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,4 +8,5 @@ starlette uvicorn uvloop websockets -requests \ No newline at end of file +requests +json \ No newline at end of file From 22ebf2e3b15f146ab79c3728d1d201356effa842 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 23 Jun 2023 14:02:34 +0800 Subject: [PATCH 152/164] multi OK --- src/main.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main.py b/src/main.py index 008b697..5b33daf 100644 --- a/src/main.py +++ b/src/main.py @@ -5,6 +5,7 @@ from fastapi.responses import JSONResponse import requests import re +import json app = FastAPI() @@ -20,7 +21,7 @@ def postForMultiUser(multiUser: multiUserModel): userQueue.append(userid) print(jsonable_encoder(userQueue)) postData = {"userid": "multiUser", - "flagforuser": "'"+jsonable_encoder(userQueue)+"'", + "flagforuser": json.dumps(userQueue), "flagforsymptom":getData['result']['flagforsymptom'], "flagfordaily":getData['result']['flagfordaily']} response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/flag', data=postData) @@ -240,18 +241,19 @@ def post_for_isReturn(isReturn: isReturnModel): score = [int(i) for i in re.findall(r'\d+', data)] ################ dequeue - ''' + sendData = {'userid': "multiUser"} response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessflag', data=sendData) getData = response.json() userQueue = eval(getData['result']['flagforuser']) - userQueue.leftpop() - postData = {"userid": userid, - "flagforuser": userQueue, + userQueue.append(userid) + print(jsonable_encoder(userQueue)) + postData = {"userid": "multiUser", + "flagforuser": json.dumps(userQueue), "flagforsymptom":getData['result']['flagforsymptom'], "flagfordaily":getData['result']['flagfordaily']} response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/flag', data=postData) - ''' + if score[0] > 7: result = {'message':'請您立即回診', 'userID': userid} From bc780a5e8717e428bd59fa091446044257443fd0 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 23 Jun 2023 14:14:42 +0800 Subject: [PATCH 153/164] ssssssssssssssss --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 5b33daf..b609f02 100644 --- a/src/main.py +++ b/src/main.py @@ -246,7 +246,7 @@ def post_for_isReturn(isReturn: isReturnModel): response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessflag', data=sendData) getData = response.json() userQueue = eval(getData['result']['flagforuser']) - userQueue.append(userid) + userQueue.pop(0) print(jsonable_encoder(userQueue)) postData = {"userid": "multiUser", "flagforuser": json.dumps(userQueue), From 6ee10819a8968f6db3e19ed3e34758be18feac81 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 23 Jun 2023 14:17:34 +0800 Subject: [PATCH 154/164] ssssssssss --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index b609f02..3f0df17 100644 --- a/src/main.py +++ b/src/main.py @@ -253,7 +253,7 @@ def post_for_isReturn(isReturn: isReturnModel): "flagforsymptom":getData['result']['flagforsymptom'], "flagfordaily":getData['result']['flagfordaily']} response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/flag', data=postData) - + print(response) if score[0] > 7: result = {'message':'請您立即回診', 'userID': userid} From 15be1f3aa56a296eead8706703425cce70fe5f00 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 23 Jun 2023 14:20:22 +0800 Subject: [PATCH 155/164] ddddddddddddddd --- src/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main.py b/src/main.py index 3f0df17..db5119e 100644 --- a/src/main.py +++ b/src/main.py @@ -18,8 +18,8 @@ def postForMultiUser(multiUser: multiUserModel): response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessflag', data=sendData) getData = response.json() userQueue = eval(getData['result']['flagforuser']) + userQueue.append(userid) - print(jsonable_encoder(userQueue)) postData = {"userid": "multiUser", "flagforuser": json.dumps(userQueue), "flagforsymptom":getData['result']['flagforsymptom'], @@ -242,12 +242,13 @@ def post_for_isReturn(isReturn: isReturnModel): score = [int(i) for i in re.findall(r'\d+', data)] ################ dequeue + userid = userid sendData = {'userid': "multiUser"} response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessflag', data=sendData) getData = response.json() userQueue = eval(getData['result']['flagforuser']) + userQueue.pop(0) - print(jsonable_encoder(userQueue)) postData = {"userid": "multiUser", "flagforuser": json.dumps(userQueue), "flagforsymptom":getData['result']['flagforsymptom'], From 7aa570ffc22bbda332471f79669fe8c5d058af45 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 23 Jun 2023 14:22:34 +0800 Subject: [PATCH 156/164] json --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8a01b1c..878f5d0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,3 @@ uvicorn uvloop websockets requests -json \ No newline at end of file From 5d3829255f9a915b66ee64fdc47ea93673674022 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 23 Jun 2023 16:35:46 +0800 Subject: [PATCH 157/164] aaaaaaaaaaaaa --- src/main.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main.py b/src/main.py index db5119e..8256cbe 100644 --- a/src/main.py +++ b/src/main.py @@ -42,7 +42,7 @@ def get_for_basic_info(): # Prepare the data data = {'userid': userid} - + print(userid) # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessbasic', data=data) # Extract data from the response @@ -56,7 +56,21 @@ def get_for_basic_info(): "userID":userid, "result": user_data['result'] } + ################ dequeue + + userid = userid + sendData = {'userid': "multiUser"} + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessflag', data=sendData) + getData = response.json() + userQueue = eval(getData['result']['flagforuser']) + userQueue.pop(0) + postData = {"userid": "multiUser", + "flagforuser": json.dumps(userQueue), + "flagforsymptom":getData['result']['flagforsymptom'], + "flagfordaily":getData['result']['flagfordaily']} + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/flag', data=postData) + print(response) return jsonable_encoder(result) @@ -240,21 +254,7 @@ def post_for_isReturn(isReturn: isReturnModel): userid = isReturn.userID score = [int(i) for i in re.findall(r'\d+', data)] - ################ dequeue - userid = userid - sendData = {'userid': "multiUser"} - response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessflag', data=sendData) - getData = response.json() - userQueue = eval(getData['result']['flagforuser']) - - userQueue.pop(0) - postData = {"userid": "multiUser", - "flagforuser": json.dumps(userQueue), - "flagforsymptom":getData['result']['flagforsymptom'], - "flagfordaily":getData['result']['flagfordaily']} - response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/flag', data=postData) - print(response) if score[0] > 7: result = {'message':'請您立即回診', 'userID': userid} From 0e4cf5e56f913c74750de267b0945c54fc8186eb Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 23 Jun 2023 16:36:06 +0800 Subject: [PATCH 158/164] aaaaaaaaaaaaaa --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 8256cbe..5b0ea74 100644 --- a/src/main.py +++ b/src/main.py @@ -42,7 +42,7 @@ def get_for_basic_info(): # Prepare the data data = {'userid': userid} - print(userid) + print("user":userid) # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessbasic', data=data) # Extract data from the response From a31aea551b3087e30393e1056b1e77ae95fe8fb4 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 23 Jun 2023 16:36:16 +0800 Subject: [PATCH 159/164] aaaaaaaaaaaaaaaa --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 5b0ea74..9c58dc8 100644 --- a/src/main.py +++ b/src/main.py @@ -42,7 +42,7 @@ def get_for_basic_info(): # Prepare the data data = {'userid': userid} - print("user":userid) + print("user",userid) # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessbasic', data=data) # Extract data from the response From 10c058f74affe82f3ad81b397c179c6500215ea1 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 4 Jul 2023 15:20:01 +0800 Subject: [PATCH 160/164] test loop --- src/main.py | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/src/main.py b/src/main.py index 9c58dc8..ac1b465 100644 --- a/src/main.py +++ b/src/main.py @@ -259,11 +259,24 @@ def post_for_isReturn(isReturn: isReturnModel): result = {'message':'請您立即回診', 'userID': userid} requests.post('https://i-care-te-st-21770a966fd0.herokuapp.com/external_api', json=result) + + postData = {"userid": userid, + "flagforuser": "", + "flagforsymptom":"2", + "flagfordaily":"0"} + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/flag', data=postData) + print(response) return "1" else: result = {'message':'您的狀況良好!請繼續保持!OvO', 'userID': userid} requests.post('https://i-care-te-st-21770a966fd0.herokuapp.com/external_api', json=result) + postData = {"userid": userid, + "flagforuser": "", + "flagforsymptom":"2", + "flagfordaily":"0"} + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/flag', data=postData) + print(response) return "0" @@ -292,3 +305,39 @@ def post_for_records(data_messages: messageModel): return jsonable_encoder(result) + + +# def deque(): +# sendData = {'userid': "multiUser"} +# response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessflag', data=sendData) +# getData = response.json() +# userQueue = eval(getData['result']['flagforuser']) + +# userQueue.pop(0) +# postData = {"userid": "multiUser", +# "flagforuser": json.dumps(userQueue), +# "flagforsymptom":getData['result']['flagforsymptom'], +# "flagfordaily":getData['result']['flagfordaily']} +# response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/flag', data=postData) +# print(response) + + +# class changeFlagModel(BaseModel): +# userid: str +# flagforuser: str +# flagforsymptom: str +# flagfordaily: str + +# @app.post("/changeFlag") +# def changeFlag(flagForChange: changeFlagModel): +# userid = flagForChange.userid +# flagforuser=flagForChange.flagforuser +# flagforsymptom=flagForChange.flagforsymptom +# flagfordaily=flagForChange.flagfordaily + +# postData = {"userid": userid, +# "flagforuser": flagforuser, +# "flagforsymptom":flagforsymptom, +# "flagfordaily":flagfordaily} +# response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/flag', data=postData) +# print(response) \ No newline at end of file From 3071d00fa398c6810e68e73d6f36bd1ae0f012af Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 4 Jul 2023 21:50:13 +0800 Subject: [PATCH 161/164] deque --- src/main.py | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/src/main.py b/src/main.py index ac1b465..50a5788 100644 --- a/src/main.py +++ b/src/main.py @@ -8,6 +8,19 @@ import json app = FastAPI() +def deque(): + sendData = {'userid': "multiUser"} + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessflag', data=sendData) + getData = response.json() + userQueue = eval(getData['result']['flagforuser']) + + userQueue.pop(0) + postData = {"userid": "multiUser", + "flagforuser": json.dumps(userQueue), + "flagforsymptom":getData['result']['flagforsymptom'], + "flagfordaily":getData['result']['flagfordaily']} + response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/flag', data=postData) + print(response) class multiUserModel(BaseModel): userID: str @@ -58,19 +71,18 @@ def get_for_basic_info(): } ################ dequeue - userid = userid - sendData = {'userid': "multiUser"} - response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessflag', data=sendData) - getData = response.json() - userQueue = eval(getData['result']['flagforuser']) - - userQueue.pop(0) - postData = {"userid": "multiUser", - "flagforuser": json.dumps(userQueue), - "flagforsymptom":getData['result']['flagforsymptom'], - "flagfordaily":getData['result']['flagfordaily']} - response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/flag', data=postData) - print(response) + # sendData = {'userid': "multiUser"} + # response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessflag', data=sendData) + # getData = response.json() + # userQueue = eval(getData['result']['flagforuser']) + + # userQueue.pop(0) + # postData = {"userid": "multiUser", + # "flagforuser": json.dumps(userQueue), + # "flagforsymptom":getData['result']['flagforsymptom'], + # "flagfordaily":getData['result']['flagfordaily']} + # response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/flag', data=postData) + # print(response) return jsonable_encoder(result) @@ -254,6 +266,7 @@ def post_for_isReturn(isReturn: isReturnModel): userid = isReturn.userID score = [int(i) for i in re.findall(r'\d+', data)] + deque() if score[0] > 7: result = {'message':'請您立即回診', @@ -307,19 +320,7 @@ def post_for_records(data_messages: messageModel): return jsonable_encoder(result) -# def deque(): -# sendData = {'userid': "multiUser"} -# response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessflag', data=sendData) -# getData = response.json() -# userQueue = eval(getData['result']['flagforuser']) -# userQueue.pop(0) -# postData = {"userid": "multiUser", -# "flagforuser": json.dumps(userQueue), -# "flagforsymptom":getData['result']['flagforsymptom'], -# "flagfordaily":getData['result']['flagfordaily']} -# response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/flag', data=postData) -# print(response) # class changeFlagModel(BaseModel): From 24464aa9cb0cc50b4e87fd24eb5dd1e51cba8171 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Tue, 4 Jul 2023 21:58:54 +0800 Subject: [PATCH 162/164] deque pop to remove --- src/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.py b/src/main.py index 50a5788..08539ba 100644 --- a/src/main.py +++ b/src/main.py @@ -8,13 +8,13 @@ import json app = FastAPI() -def deque(): +def deque(userid): sendData = {'userid': "multiUser"} response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/accessflag', data=sendData) getData = response.json() userQueue = eval(getData['result']['flagforuser']) - userQueue.pop(0) + userQueue.remove(userid) postData = {"userid": "multiUser", "flagforuser": json.dumps(userQueue), "flagforsymptom":getData['result']['flagforsymptom'], @@ -266,7 +266,7 @@ def post_for_isReturn(isReturn: isReturnModel): userid = isReturn.userID score = [int(i) for i in re.findall(r'\d+', data)] - deque() + deque(userid) if score[0] > 7: result = {'message':'請您立即回診', From bd491095eca3a9efec427c7218ef7799cf0c4eb2 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 7 Jul 2023 10:21:08 +0800 Subject: [PATCH 163/164] get basic Info dequeue --- src/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 08539ba..46a5a18 100644 --- a/src/main.py +++ b/src/main.py @@ -69,6 +69,8 @@ def get_for_basic_info(): "userID":userid, "result": user_data['result'] } + + deque(userid) ################ dequeue # sendData = {'userid': "multiUser"} @@ -266,7 +268,7 @@ def post_for_isReturn(isReturn: isReturnModel): userid = isReturn.userID score = [int(i) for i in re.findall(r'\d+', data)] - deque(userid) + # deque(userid) if score[0] > 7: result = {'message':'請您立即回診', From 39042b243052a6920623d23814d7fdbfdc8a1093 Mon Sep 17 00:00:00 2001 From: jack80806 Date: Fri, 7 Jul 2023 10:50:18 +0800 Subject: [PATCH 164/164] testInfo --- src/main.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main.py b/src/main.py index 46a5a18..dfff851 100644 --- a/src/main.py +++ b/src/main.py @@ -120,24 +120,24 @@ def post_for_symptoms(symptoms: SymptomsModel): # Prepare the data data2 = { - 'userid': userid, - "urineprotein": "-", - "urineob": "-", - "urineglucose": "-", - "bloodhb": "15", - "bloodht": "45", - "bloodplt": "30", - "bloodpressure": "73-124", - "bloodrbc": "500", - "bloodwbc": "5500 %", - "cholesterol": "150", - "hbeag": "-", - "hbsab": "-", - "hbsag": "-", - "kidneybun": "15", - "liversgot": "25", - "liversgpt": "30", - "kidneycre": "0.7" + 'userid': userid, + "urineprotein": "- ", + "urineob": "-", + "urineglucose": "-", + "bloodhb": "15 g/dL", + "bloodht": "45 %", + "bloodplt": "120 x 10^3/µL", + "bloodpressure": "舒張壓:89 mmHg, 收縮壓:132 mmHg", + "bloodrbc": "500 x 10^6/µL", + "bloodwbc": "12.3 x 10^3/µL", + "cholesterol": "150 mg/dL", + "hbeag": "-", + "hbsab": "-", + "hbsag": "-", + "kidneybun": "15 mg/dL", + "liversgot": "25 U/L", + "liversgpt": "30 U/L", + "kidneycre": "0.7 mg/dL" } # Send a POST request response = requests.post('https://us-central1-fortesting-c54ba.cloudfunctions.net/post/testinfo', data=data2)