From d63c24bb62943f12a91ff3849d316e32b68448ea Mon Sep 17 00:00:00 2001 From: kaede10 Date: Mon, 20 Nov 2023 11:30:31 +0800 Subject: [PATCH] update pr_review --- pr_review/Dockerfile | 14 ++++++++++---- pr_review/requirements.txt | 2 +- pr_review/src/config/init_config.py | 2 -- pr_review/src/gpt/bot.py | 2 +- pr_review/src/main.py | 9 ++++----- pr_review/src/router/router.py | 4 ++-- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/pr_review/Dockerfile b/pr_review/Dockerfile index e21a5d9..7f6a45a 100644 --- a/pr_review/Dockerfile +++ b/pr_review/Dockerfile @@ -1,12 +1,17 @@ -FROM openeuler/openeuler:22.03 +FROM openeuler/openeuler:22.03-lts-sp1 + +RUN yum update -y \ + && yum install -y shadow RUN groupadd -g 1001 pr \ && useradd -u 1001 -g pr -s /bin/bash -m pr -RUN cd /home/pr +RUN cd /home/pr && \ + yum install -y sudo && \ + usermod -aG root pr && \ + echo 'pr ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers -RUN yum update -y \ - && yum install -y make gcc zlib-devel openssl-devel bzip2-devel ncurses-devel gdbm-devel readline-devel sqlite-devel libffi-devel tk-devel xz-devel \ +RUN yum install -y make gcc zlib-devel openssl-devel bzip2-devel ncurses-devel gdbm-devel readline-devel sqlite-devel libffi-devel tk-devel xz-devel \ && yum install -y openssl-devel openssl \ && yum install -y wget @@ -34,3 +39,4 @@ USER pr EXPOSE 8080 CMD ["python3", "src/main.py"] + diff --git a/pr_review/requirements.txt b/pr_review/requirements.txt index f764524..d7dbc77 100644 --- a/pr_review/requirements.txt +++ b/pr_review/requirements.txt @@ -4,4 +4,4 @@ loguru==0.7.0 PyYAML==6.0.1 Requests==2.31.0 tiktoken==0.3.0 -werkzeug==2.2.2 +werkzeug==2.2.2 \ No newline at end of file diff --git a/pr_review/src/config/init_config.py b/pr_review/src/config/init_config.py index 85c6eb2..0fd1f0f 100644 --- a/pr_review/src/config/init_config.py +++ b/pr_review/src/config/init_config.py @@ -1,6 +1,5 @@ import yaml - from gitee.gitee_api import GiteeCaller from gpt.bot import Gpt @@ -9,7 +8,6 @@ from gpt.bot import Gpt def init_config(path): with open(path, "r", encoding="utf-8") as f: config = yaml.safe_load(f) - print(config) GiteeCaller.init_config_attr(config["access_token"], config["gitee_host"]) diff --git a/pr_review/src/gpt/bot.py b/pr_review/src/gpt/bot.py index 1b7245c..d520d2a 100644 --- a/pr_review/src/gpt/bot.py +++ b/pr_review/src/gpt/bot.py @@ -1,3 +1,4 @@ +import json import requests import tiktoken from loguru import logger @@ -106,7 +107,6 @@ class Bot(Gpt): LGTM ''' - def chat(self, prompt): data = { "model": "gpt-3.5-turbo", diff --git a/pr_review/src/main.py b/pr_review/src/main.py index ac01ca7..47e888c 100644 --- a/pr_review/src/main.py +++ b/pr_review/src/main.py @@ -1,12 +1,11 @@ -import click +import os from router import router from config import init_config -@click.command() -@click.option("--config", default="config.yaml", help="config file path") -def main(config): - init_config.init_config(config) +def main(): + path = os.getenv("APPLICATION_PATH") + init_config.init_config(path) router.start_router() diff --git a/pr_review/src/router/router.py b/pr_review/src/router/router.py index 8221e8c..552f834 100644 --- a/pr_review/src/router/router.py +++ b/pr_review/src/router/router.py @@ -1,3 +1,4 @@ +import threading from flask import request from flask import Flask @@ -11,7 +12,6 @@ app = Flask(__name__) @app.route("/hook/analyze", methods=["POST"]) def analyze(): data = request.get_json() - start_thread(assgin_task, data) return "Processing completed" @@ -23,4 +23,4 @@ def before_request(): def start_router(): - app.run("0.0.0.0", debug=True, port=8080) + app.run("0.0.0.0", port=8080) -- Gitee