Merge pull request #1 from tuna2134/main

Dockerfile

@@ -1,3 +1,11 @@
 FROM python:3
-USER root
-CMD ["python3", "main.py"]
+
+
+WORKDIR /app
+
+
+COPY requirements.txt .
+RUN pip install -r requirements.txt
+
+COPY . .
+CMD ["gunicorn", "main:app", "-b", "0.0.0.0:8080"]

main.py

@@ -13,10 +13,15 @@ BASE_GD_IMAGE = Image.open("images/base-gd.png")
 BASE_IMAGE = Image.open("images/base.png")
 MPLUS_FONT = ImageFont.truetype("fonts/MPLUSRounded1c-Regular.ttf", size=16)
 
-def draw_text(im,ofs,string,font="fonts/MPLUSRounded1c-Regular.ttf",size=16,color=(0,0,0,255),split_len=None,padding=4,auto_expand=False,disable_dot_wrap=False):
-    
+
+def draw_text(
+    im, ofs, string, font="fonts/MPLUSRounded1c-Regular.ttf", size=16,
+    color=(0, 0, 0, 255), split_len=None, padding=4, auto_expand=False,
+    disable_dot_wrap=False
+):
+
     draw = ImageDraw.Draw(im)
-    fontObj = ImageFont.truetype(font,size=size)
+    fontObj = ImageFont.truetype(font, size=size)
 
     pure_lines = []
     pos = 0
@@ -48,8 +53,8 @@ def draw_text(im,ofs,string,font="fonts/MPLUSRounded1c-Regular.ttf",size=16,colo
     lines = []
 
     for line in pure_lines:
-        lines.extend(textwrap.wrap(line,width=split_len))
-    
+        lines.extend(textwrap.wrap(line, width=split_len))
+
     dy = 0
 
     draw_lines = []
@@ -61,57 +66,68 @@ def draw_text(im,ofs,string,font="fonts/MPLUSRounded1c-Regular.ttf",size=16,colo
         t_height = tsize[1]
 
         x = int(ofs[0] - (tsize[0]/2))
-        draw_lines.append((x,ofs_y,line))
+        draw_lines.append((x, ofs_y, line))
         ofs_y += t_height + padding
         dy += t_height + padding
-    
+
     adj_y = -30 * (len(draw_lines)-1)
     for dl in draw_lines:
         with Pilmoji(im) as p:
-            p.text((dl[0],(adj_y + dl[1])),dl[2],font=fontObj,fill=color)
+            p.text((dl[0], (adj_y + dl[1])), dl[2], font=fontObj, fill=color)
 
     real_y = ofs[1] + adj_y + dy
 
-    return (0,dy,real_y)
+    return (0, dy, real_y)
+
 
-def make(name,tag,id,content,icon):
+def make(name, tag, id, content, icon):
     img = BASE_IMAGE.copy()
 
     icon = Image.open(io.BytesIO(requests.get(icon).content))
-    icon = icon.resize((720,720),Image.LANCZOS)
+    icon = icon.resize((720, 720), Image.LANCZOS)
     icon = icon.convert("L")
     icon_filtered = ImageEnhance.Brightness(icon)
 
-    img.paste(icon_filtered.enhance(0.7),(0,0))
-    img.paste(BASE_GD_IMAGE,(0,0),BASE_GD_IMAGE)
+    img.paste(icon_filtered.enhance(0.7), (0, 0))
+    img.paste(BASE_GD_IMAGE, (0, 0), BASE_GD_IMAGE)
 
     tx = ImageDraw.Draw(img)
 
-    tsize_t = draw_text(img,(890,270),content,size=45,color=(255,255,255,255),split_len=16,auto_expand=True)
+    tsize_t = draw_text(img, (890, 270), content, size=45, color=(
+        255, 255, 255, 255), split_len=16, auto_expand=True)
 
     name_y = tsize_t[2] + 40
-    tsize_name = draw_text(img,(890,name_y),f"{name}#{tag}",size=25,color=(255,255,255,255),split_len=25,disable_dot_wrap=True)
+    tsize_name = draw_text(img, (890, name_y), f"{name}#{tag}", size=25, color=(
+        255, 255, 255, 255), split_len=25, disable_dot_wrap=True)
 
     id_y = name_y + tsize_name[1] + 4
-    tsize_id = draw_text(img,(890,id_y),id,size=18,color=(180,180,180,255),split_len=45,disable_dot_wrap=True)
+    tsize_id = draw_text(img, (890, id_y), id, size=18, color=(
+        180, 180, 180, 255), split_len=45, disable_dot_wrap=True)
 
-    tx.text((1125,694),"TakasumiBOT#7189",font=MPLUS_FONT,fill=(120,120,120,255))
+    tx.text((1125, 694), "TakasumiBOT#7189",
+            font=MPLUS_FONT, fill=(120, 120, 120, 255))
 
     file = io.BytesIO()
-    img.save(file,format="PNG",quality=95)
+    img.save(file, format="PNG", quality=95)
     file.seek(0)
     return file
 
+
 app = Flask(__name__)
-@app.route("/",methods=["GET"])
+
+
+@app.route("/", methods=["GET"])
 def main():
     res = make(
         request.args.get("name") or "名無し",
         request.args.get("tag") or "0000",
         request.args.get("id") or "0000000000000000000",
         request.args.get("content") or "これはテストです",
-        request.args.get("icon") or "https://cdn.discordapp.com/embed/avatars/0.png"
+        request.args.get(
+            "icon") or "https://cdn.discordapp.com/embed/avatars/0.png"
     )
-    return send_file(res,mimetype="image/png")
+    return send_file(res, mimetype="image/png")
+
 
-app.run(host="0.0.0.0",port=3000)
+if __name__ == "__main__":
+    app.run(host="0.0.0.0", port=3000)

requirements.txt

@@ -1,129 +1,5 @@
-aiofiles==22.1.0
-aiosqlite==0.18.0
-anyio==3.6.2
-argon2-cffi==21.3.0
-argon2-cffi-bindings==21.2.0
-arrow==1.2.3
-asttokens==2.2.1
-attrs==22.2.0
-Babel==2.11.0
-backcall==0.2.0
-beautifulsoup4==4.11.2
-bleach==6.0.0
-certifi==2022.12.7
-cffi==1.15.1
-charset-normalizer==3.0.1
-click==8.1.3
-colorama==0.4.6
-comm==0.1.2
-contourpy==1.0.7
-cycler==0.11.0
-debugpy==1.6.6
-decorator==5.1.1
-defusedxml==0.7.1
-emoji==2.2.0
-executing==1.2.0
-fastjsonschema==2.16.2
-Flask==2.2.3
-fonttools==4.38.0
-fqdn==1.5.1
-gitdb==4.0.10
-GitPython==3.1.30
-idna==3.4
-ipykernel==6.21.2
-ipython==8.10.0
-ipython-genutils==0.2.0
-isoduration==20.11.0
-itsdangerous==2.1.2
-jedi==0.18.2
-Jinja2==3.1.2
-joblib==1.2.0
-json5==0.9.11
-jsonpointer==2.3
-jsonschema==4.17.3
-jupyter-events==0.5.0
-jupyter-server-mathjax==0.2.6
-jupyter-ydoc==0.2.2
-jupyter_client==8.0.2
-jupyter_core==5.2.0
-jupyter_server==2.3.0
-jupyter_server_fileid==0.6.0
-jupyter_server_terminals==0.4.4
-jupyter_server_ydoc==0.6.1
-jupyterlab==3.6.1
-jupyterlab-git==0.41.0
-jupyterlab-pygments==0.2.2
-jupyterlab_server==2.19.0
-kiwisolver==1.4.4
-MarkupSafe==2.1.2
-matplotlib==3.7.0
-matplotlib-inline==0.1.6
-mistune==2.0.5
-nbclassic==0.5.1
-nbclient==0.7.2
-nbconvert==7.2.9
-nbdime==3.1.1
-nbformat==5.7.3
-nest-asyncio==1.5.6
-notebook==6.5.2
-notebook_shim==0.2.2
-numpy==1.24.2
-nvidia-cublas-cu11==11.10.3.66
-nvidia-cuda-nvrtc-cu11==11.7.99
-nvidia-cuda-runtime-cu11==11.7.99
-nvidia-cudnn-cu11==8.5.0.96
-packaging==23.0
-pandas==1.5.3
-pandocfilters==1.5.0
-parso==0.8.3
-pexpect==4.8.0
-pickleshare==0.7.5
-Pillow==9.4.0
+pillow==9.4.0
 pilmoji==2.0.2
-platformdirs==3.0.0
-plotly==5.13.0
-prometheus-client==0.16.0
-prompt-toolkit==3.0.36
-psutil==5.9.4
-ptyprocess==0.7.0
-pure-eval==0.2.2
-pycparser==2.21
-Pygments==2.14.0
-pyparsing==3.0.9
-pyrsistent==0.19.3
-python-dateutil==2.8.2
-python-json-logger==2.0.6
-pytz==2022.7.1
-PyYAML==6.0
-pyzmq==25.0.0
+flask==2.2.3
 requests==2.28.2
-rfc3339-validator==0.1.4
-rfc3986-validator==0.1.1
-scikit-learn==1.2.1
-scipy==1.10.0
-seaborn==0.12.2
-Send2Trash==1.8.0
-six==1.16.0
-smmap==5.0.0
-sniffio==1.3.0
-soupsieve==2.4
-stack-data==0.6.2
-tenacity==8.2.1
-terminado==0.17.1
-textwrap3==0.9.2
-threadpoolctl==3.1.0
-tinycss2==1.2.1
-tomli==2.0.1
-torch==1.13.1
-tornado==6.2
-traitlets==5.9.0
-typing_extensions==4.5.0
-uri-template==1.2.0
-urllib3==1.26.14
-wcwidth==0.2.6
-webcolors==1.12
-webencodings==0.5.1
-websocket-client==1.5.1
-Werkzeug==2.2.3
-y-py==0.5.5
-ypy-websocket==0.8.2
+gunicorn==20.1.0