Skip to content

Commit 5fe9c57

Browse files
sauravpandasauravpanda
authored
Merge pull request #195 from Cloud-Code-AI/194-craete-a-public-docker-image-to-deploy-the-github-app
194 craete a public docker image to deploy the GitHub app
2 parents a21f000 + 01eb2be commit 5fe9c57

File tree

7 files changed

+219
-6
lines changed

7 files changed

+219
-6
lines changed

‎.dockerignore‎

Lines changed: 168 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,168 @@
1+
# Byte-compiled / optimized / DLL files
2+
__pycache__/
3+
*.py[cod]
4+
*$py.class
5+
6+
# C extensions
7+
*.so
8+
9+
# Distribution / packaging
10+
.Python
11+
build/
12+
develop-eggs/
13+
dist/
14+
downloads/
15+
eggs/
16+
.eggs/
17+
lib/
18+
lib64/
19+
parts/
20+
sdist/
21+
var/
22+
wheels/
23+
share/python-wheels/
24+
*.egg-info/
25+
.installed.cfg
26+
*.egg
27+
MANIFEST
28+
29+
# PyInstaller
30+
# Usually these files are written by a python script from a template
31+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
32+
*.manifest
33+
*.spec
34+
35+
# Installer logs
36+
pip-log.txt
37+
pip-delete-this-directory.txt
38+
39+
# Unit test / coverage reports
40+
htmlcov/
41+
.tox/
42+
.nox/
43+
.coverage
44+
.coverage.*
45+
.cache
46+
nosetests.xml
47+
coverage.xml
48+
*.cover
49+
*.py,cover
50+
.hypothesis/
51+
.pytest_cache/
52+
cover/
53+
54+
# Translations
55+
*.mo
56+
*.pot
57+
58+
# Django stuff:
59+
*.log
60+
local_settings.py
61+
db.sqlite3
62+
db.sqlite3-journal
63+
64+
# Flask stuff:
65+
instance/
66+
.webassets-cache
67+
68+
# Scrapy stuff:
69+
.scrapy
70+
71+
# Sphinx documentation
72+
docs/_build/
73+
74+
# PyBuilder
75+
.pybuilder/
76+
target/
77+
78+
# Jupyter Notebook
79+
.ipynb_checkpoints
80+
81+
# IPython
82+
profile_default/
83+
ipython_config.py
84+
85+
# pyenv
86+
# For a library or package, you might want to ignore these files since the code is
87+
# intended to run in multiple environments; otherwise, check them in:
88+
# .python-version
89+
90+
# pipenv
91+
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
92+
# However, in case of collaboration, if having platform-specific dependencies or dependencies
93+
# having no cross-platform support, pipenv may install dependencies that don't work, or not
94+
# install all needed dependencies.
95+
#Pipfile.lock
96+
97+
# poetry
98+
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
99+
# This is especially recommended for binary packages to ensure reproducibility, and is more
100+
# commonly ignored for libraries.
101+
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
102+
#poetry.lock
103+
104+
# pdm
105+
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
106+
#pdm.lock
107+
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
108+
# in version control.
109+
# https://pdm.fming.dev/#use-with-ide
110+
.pdm.toml
111+
112+
# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
113+
__pypackages__/
114+
115+
# Celery stuff
116+
celerybeat-schedule
117+
celerybeat.pid
118+
119+
# SageMath parsed files
120+
*.sage.py
121+
122+
# Environments
123+
.env
124+
.venv
125+
env/
126+
venv/
127+
ENV/
128+
env.bak/
129+
venv.bak/
130+
131+
# Spyder project settings
132+
.spyderproject
133+
.spyproject
134+
135+
# Rope project settings
136+
.ropeproject
137+
138+
# mkdocs documentation
139+
/site
140+
141+
# mypy
142+
.mypy_cache/
143+
.dmypy.json
144+
dmypy.json
145+
146+
# Pyre type checker
147+
.pyre/
148+
149+
# pytype static type analyzer
150+
.pytype/
151+
152+
# Cython debug symbols
153+
cython_debug/
154+
155+
# PyCharm
156+
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
157+
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
158+
# and can be added to the global gitignore or merged into this file. For a more nuclear
159+
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
160+
#.idea/
161+
162+
.env
163+
*.pem
164+
node_modules
165+
.next
166+
167+
.cloudcode
168+
.kaizen

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use the official Python image as the base image
2-
FROM python:3.9-slim
2+
FROM python:3.12-slim
33

44
# Set the working directory in the container
55
WORKDIR /app

‎docker-compose-dev.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: '3'
2+
services:
3+
app:
4+
build: .
5+
ports:
6+
- "8000:8000"
7+
env_file:
8+
- .env
9+
environment:
10+
- ENV=production
11+
- GITHUB_APP_PEM_PATH=/run/secrets/github_app_pem
12+
restart: always
13+
secrets:
14+
- github_app_pem
15+
16+
secrets:
17+
github_app_pem:
18+
file: ./GITHUB_APP_NIGHTLY.pem

‎docker-compose.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
version: '3'
22
services:
33
app:
4-
build: .
4+
image: cloudcodeai/kaizen-app
55
ports:
66
- "8000:8000"
77
env_file:
88
- .env
99
environment:
1010
- ENV=production
11-
restart: always
11+
- GITHUB_APP_PEM_PATH=/run/secrets/github_app_pem
12+
restart: always
13+
secrets:
14+
- github_app_pem
15+
16+
secrets:
17+
github_app_pem:
18+
file: ./GITHUB_APP_NIGHTLY.pem

‎github_app/github_helper/utils.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,12 @@ def generate_jwt():
2727

2828
# Define the JWT payload
2929
payload = {"iat": issued_at_time, "exp": expiration_time, "iss": GITHUB_APP_ID}
30-
with open("GITHUB_APP_KEY.pem", "r") as f:
30+
file_path = os.environ.get("GITHUB_APP_PEM_PATH", "GITHUB_APP_KEY.pem")
31+
logger.info(f"filepath: {file_path}")
32+
with open(file_path, "r") as f:
3133
# Encode the JWT using the RS256 algorithm
3234
encoded_jwt = jwt.encode(payload, f.read(), algorithm="RS256")
35+
logger.info(f"f.read(): {f.read()}")
3336
return encoded_jwt
3437

3538

‎kaizen/llms/prompts.py‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,23 @@
151151
MERGE_PR_DESCRIPTION_PROMPT = """
152152
Given all the PR description below as json, merge them and create a single PR Description.
153153
154+
Make sure the output is in JSON format as shown:
155+
{{
156+
"desc": "
157+
### Summary
158+
159+
<Brief one-line summary of the pull request>
160+
161+
### Details
162+
163+
<Detailed multi-line description in markdown format>
164+
- List of key changes
165+
- New features
166+
- Refactoring details
167+
- ...
168+
"
169+
}}
170+
154171
Here is the information:
155172
{DESCS}
156173
"""

‎kaizen/reviewer/code_review.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ def generate_pull_request_desc(
145145
resp, usage = self.provider.chat_completion(prompt, user=user)
146146
total_usage = self.provider.update_usage(total_usage, usage)
147147
desc_json = parser.extract_json(resp)
148-
descs.extend(desc_json["desc"])
148+
descs.append(desc_json["desc"])
149149

150-
prompt = MERGE_PR_DESCRIPTION_PROMPT.format(json.dumps(descs))
150+
prompt = MERGE_PR_DESCRIPTION_PROMPT.format(DESCS=json.dumps(descs))
151151
resp, usage = self.provider.chat_completion(prompt, user=user)
152152
total_usage = self.provider.update_usage(total_usage, usage)
153153
desc = parser.extract_json(resp)["desc"]

0 commit comments

Comments
 (0)