fast check

.dockerignore

@@ -1,4 +1,4 @@
-.vercel
-venv
-.idea
+.vercel
+venv
+.idea
 __pycache__

README.md

@@ -1,8 +1,8 @@
----
-title: pimthaigans
-emoji: 🐳
-colorFrom: purple
-colorTo: gray
-sdk: docker
-app_port: 7860
----
+---
+title: pimthaigans
+emoji: 🐳
+colorFrom: purple
+colorTo: gray
+sdk: docker
+app_port: 7860
+---

routes/api.py

@@ -1,6 +1,6 @@
-from fastapi import APIRouter
-from src.endpoints import generate, view
-
-router = APIRouter()
-router.include_router(generate.router)
-router.include_router(view.router)
+from fastapi import APIRouter
+from src.endpoints import generate, view
+
+router = APIRouter()
+router.include_router(generate.router)
+router.include_router(view.router)

src/endpoints/generate.py

@@ -1,86 +1,86 @@
-import os
-from typing import List
-
-from fastapi import APIRouter
-
-from src.libs.image import save_img, generate_img_index
-from src.libs.model import CganCols, get_model
-from src.libs.s3 import s3client
-from src.models.generate import GenerateResult, ImageResult
-from src.models.main import User, Method
-
-IMAGE_STORE_PATH = os.path.abspath("./src/store")
-BUCKET_NAME = "pimthaigans-image-container"
-
-# just make sure to have IMAGE_STORE_PATH folder created
-if not os.path.exists(IMAGE_STORE_PATH):
-    os.makedirs(IMAGE_STORE_PATH)
-
-router = APIRouter(
-    prefix="/generate",
-    tags=["Generate"],
-    responses={404: {"description": "Not found"}},
-)
-
-model = CganCols()
-
-
-@router.get("/")
-async def info():
-    return {"info": "This is the generate endpoint"}
-
-
-@router.get("/status")
-async def status():
-    return {"status": "OK"}
-
-
-@router.post("/")
-async def generate(user: User, index: int | None = None) -> GenerateResult:
-    if index or index == 0:
-        result: GenerateResult = await generate_index(user, index)
-        return result
-
-    result: GenerateResult = await generate_all(user)
-    return result
-
-
-async def generate_index(user: User, index: int) -> GenerateResult:
-    s3 = s3client()
-
-    img_detail = s3uploadimage(user, s3, index)
-    result: List[ImageResult] = [img_detail]
-
-    s3.close()
-
-    return GenerateResult(user=user, method=Method.index, result=result)
-
-
-async def generate_all(user: User):
-    s3 = s3client()
-    result: List[ImageResult] = []
-
-    for index in range(0, 88):
-        img_detail = s3uploadimage(user, s3, index)
-        result.append(img_detail)
-
-    s3.close()
-
-    return GenerateResult(user=user, method=Method.all, result=result)
-
-
-def s3uploadimage(user, s3, index):
-    output_path = os.path.join(
-        IMAGE_STORE_PATH, f"{user.uuid}-{str(index).zfill(2)}.png")
-    used_model = model.model_cols[get_model(index)]
-    image = generate_img_index(reloaded_model=used_model, index=index % 11)
-    save_img(image, output_path)
-
-    s3_path: str = f"{user.uuid}/{str(index).zfill(2)}.png"
-    s3.upload_file(output_path, BUCKET_NAME, s3_path)
-    image_url = f'https://{BUCKET_NAME}.s3.amazonaws.com/{s3_path}'
-
-    img_detail = ImageResult(index=index,
-                             image_url=image_url)
-    os.remove(output_path)
-    return img_detail
+import os
+from typing import List
+
+from fastapi import APIRouter
+
+from src.libs.image import save_img, generate_img_index
+from src.libs.model import CganCols, get_model
+from src.libs.s3 import s3client
+from src.models.generate import GenerateResult, ImageResult
+from src.models.main import User, Method
+
+IMAGE_STORE_PATH = os.path.abspath("./src/store")
+BUCKET_NAME = "pimthaigans-image-container"
+
+# just make sure to have IMAGE_STORE_PATH folder created
+if not os.path.exists(IMAGE_STORE_PATH):
+    os.makedirs(IMAGE_STORE_PATH)
+
+router = APIRouter(
+    prefix="/generate",
+    tags=["Generate"],
+    responses={404: {"description": "Not found"}},
+)
+
+model = CganCols()
+
+
+@router.get("/")
+async def info():
+    return {"info": "This is the generate endpoint"}
+
+
+@router.get("/status")
+async def status():
+    return {"status": "OK"}
+
+
+@router.post("/")
+async def generate(user: User, index: int | None = None) -> GenerateResult:
+    if index or index == 0:
+        result: GenerateResult = await generate_index(user, index)
+        return result
+
+    result: GenerateResult = await generate_all(user)
+    return result
+
+
+async def generate_index(user: User, index: int) -> GenerateResult:
+    s3 = s3client()
+
+    img_detail = s3uploadimage(user, s3, index)
+    result: List[ImageResult] = [img_detail]
+
+    s3.close()
+
+    return GenerateResult(user=user, method=Method.index, result=result)
+
+
+async def generate_all(user: User):
+    s3 = s3client()
+    result: List[ImageResult] = []
+
+    for index in range(0, 88):
+        img_detail = s3uploadimage(user, s3, index)
+        result.append(img_detail)
+
+    s3.close()
+
+    return GenerateResult(user=user, method=Method.all, result=result)
+
+
+def s3uploadimage(user, s3, index):
+    output_path = os.path.join(
+        IMAGE_STORE_PATH, f"{user.uuid}-{str(index).zfill(2)}.png")
+    used_model = model.model_cols[get_model(index)]
+    image = generate_img_index(reloaded_model=used_model, index=index % 11)
+    save_img(image, output_path)
+
+    s3_path: str = f"{user.uuid}/{str(index).zfill(2)}.png"
+    s3.upload_file(output_path, BUCKET_NAME, s3_path)
+    image_url = f'https://{BUCKET_NAME}.s3.amazonaws.com/{s3_path}'
+
+    img_detail = ImageResult(index=index,
+                             image_url=image_url)
+    os.remove(output_path)
+    return img_detail

src/endpoints/view.py

@@ -1,63 +1,63 @@
-from fastapi import APIRouter
-
-from src.libs.s3 import s3resource
-from src.models.view import ViewResult, ViewImage
-from src.models.main import User, Method
-from uuid import UUID
-
-router = APIRouter(
-    prefix="/view",
-    tags=["View"],
-    responses={404: {"description": "Not found"}},
-)
-
-BUCKET_NAME = "pimthaigans-image-container"
-
-
-@router.get("/status")
-async def status():
-    return {"status": "OK"}
-
-
-@router.get("/")
-async def view(user: UUID, index: int | None = None) -> ViewResult:
-    s3 = s3resource()
-    bucket = s3.Bucket('pimthaigans-image-container')
-
-    objs = list(bucket.objects.filter(Prefix=f'{user}/'))
-    path_objs = [obj.key for obj in objs]
-
-    if len(path_objs) == 0:
-        return ViewResult(user=User(uuid=user), method=Method.index, result=None)
-
-    if index or index == 0:
-        result: ViewResult = await view_index(User(uuid=user), index, path_objs)
-        return result
-
-    result: ViewResult = await view_all(User(uuid=user), path_objs)
-    return result
-
-
-async def view_index(user: User, index: int, path_objs) -> ViewResult:
-    imgs = [obj for obj in path_objs if obj.endswith(
-        f'{str(index).zfill(2)}.png')]
-    if len(imgs) > 0:
-        img_url = f'https://{BUCKET_NAME}.s3.amazonaws.com/{imgs[0]}'
-        return ViewResult(user=user, method=Method.index, result=[ViewImage(index=index, image_url=img_url)])
-
-    return ViewResult(user=user, method=Method.index, result=None)
-
-
-async def view_all(user: User, path_objs) -> ViewResult:
-    img_urls = []
-    for index in range(0, 88):
-        imgs = [obj for obj in path_objs if obj.endswith(
-            f'{str(index).zfill(2)}.png')]
-        if len(imgs) > 0:
-            img_urls.append(
-                f'https://{BUCKET_NAME}.s3.amazonaws.com/{imgs[0]}')
-        else:
-            return ViewResult(user=user, method=Method.all, result=None)
-
-    return ViewResult(user=user, method=Method.all,
-                      result=[ViewImage(index=index, image_url=img_url) for index, img_url in enumerate(img_urls)])
+from fastapi import APIRouter
+
+from src.libs.s3 import s3resource
+from src.models.view import ViewResult, ViewImage
+from src.models.main import User, Method
+from uuid import UUID
+
+router = APIRouter(
+    prefix="/view",
+    tags=["View"],
+    responses={404: {"description": "Not found"}},
+)
+
+BUCKET_NAME = "pimthaigans-image-container"
+
+
+@router.get("/status")
+async def status():
+    return {"status": "OK"}
+
+
+@router.get("/")
+async def view(user: UUID, index: int | None = None) -> ViewResult:
+    s3 = s3resource()
+    bucket = s3.Bucket('pimthaigans-image-container')
+
+    objs = list(bucket.objects.filter(Prefix=f'{user}/'))
+    path_objs = [obj.key for obj in objs]
+
+    if len(path_objs) == 0:
+        return ViewResult(user=User(uuid=user), method=Method.index, result=None)
+
+    if index or index == 0:
+        result: ViewResult = await view_index(User(uuid=user), index, path_objs)
+        return result
+
+    result: ViewResult = await view_all(User(uuid=user), path_objs)
+    return result
+
+
+async def view_index(user: User, index: int, path_objs) -> ViewResult:
+    imgs = [obj for obj in path_objs if obj.endswith(
+        f'{str(index).zfill(2)}.png')]
+    if len(imgs) > 0:
+        img_url = f'https://{BUCKET_NAME}.s3.amazonaws.com/{imgs[0]}'
+        return ViewResult(user=user, method=Method.index, result=[ViewImage(index=index, image_url=img_url)])
+
+    return ViewResult(user=user, method=Method.index, result=None)
+
+
+async def view_all(user: User, path_objs) -> ViewResult:
+    img_urls = []
+    for index in range(0, 88):
+        imgs = [obj for obj in path_objs if obj.endswith(
+            f'{str(index).zfill(2)}.png')]
+        if len(imgs) > 0:
+            img_urls.append(
+                f'https://{BUCKET_NAME}.s3.amazonaws.com/{imgs[0]}')
+        else:
+            return ViewResult(user=user, method=Method.all, result=None)
+
+    return ViewResult(user=user, method=Method.all,
+                      result=[ViewImage(index=index, image_url=img_url) for index, img_url in enumerate(img_urls)])

src/libs/image.py

@@ -1,16 +1,16 @@
-import numpy as np
-import matplotlib.pyplot as plt
-
-
-def generate_img_index(index, reloaded_model):
-    noise = np.random.normal(0, 1, (1,))
-    label = np.array([[index]])
-    return reloaded_model.predict([noise, label])[0]
-
-
-def save_img(image, output_path):
-    plt.imshow(image, cmap='gray')
-    plt.axis('off')
-    plt.grid(False)
-    plt.savefig(output_path, bbox_inches='tight', pad_inches=0)
+import numpy as np
+import matplotlib.pyplot as plt
+
+
+def generate_img_index(index, reloaded_model):
+    noise = np.random.normal(0, 1, (1,))
+    label = np.array([[index]])
+    return reloaded_model.predict([noise, label])[0]
+
+
+def save_img(image, output_path):
+    plt.imshow(image, cmap='gray')
+    plt.axis('off')
+    plt.grid(False)
+    plt.savefig(output_path, bbox_inches='tight', pad_inches=0)
     plt.close()

src/libs/model.py

@@ -1,51 +1,51 @@
-from huggingface_hub import from_pretrained_keras
-
-
-class CganCols:
-    def __init__(self):
-        self.model_0 = from_pretrained_keras('SupawitMarayat/pimthaigans-cgan-0010')
-        self.model_1 = from_pretrained_keras('SupawitMarayat/pimthaigans-cgan-1121')
-        self.model_2 = from_pretrained_keras('SupawitMarayat/pimthaigans-cgan-2232')
-        self.model_3 = from_pretrained_keras('SupawitMarayat/pimthaigans-cgan-3343')
-        self.model_4 = from_pretrained_keras('SupawitMarayat/pimthaigans-cgan-4454')
-        self.model_5 = from_pretrained_keras('SupawitMarayat/pimthaigans-cgan-5565')
-        self.model_6 = from_pretrained_keras('SupawitMarayat/pimthaigans-cgan-6676')
-        self.model_7 = from_pretrained_keras('SupawitMarayat/pimthaigans-cgan-7787')
-
-        self.model_cols = [self.model_0, self.model_1, self.model_2, self.model_3, self.model_4, self.model_5,
-                           self.model_6, self.model_7]
-
-
-def get_model(index: int):
-    """
-    Returns the model based on the given index.
-
-    Index ranges and corresponding model values:
-    0-10   ->  0
-    11-21  ->  1
-    22-32  ->  2
-    33-43  ->  3
-    44-54  ->  4
-    55-65  ->  5
-    66-76  ->  6
-    77-87  ->  7
-
-    :param index: The index value.
-    :return: The corresponding model value.
-    """
-    if 0 <= index <= 10:
-        return 0
-    elif 11 <= index <= 21:
-        return 1
-    elif 22 <= index <= 32:
-        return 2
-    elif 33 <= index <= 43:
-        return 3
-    elif 44 <= index <= 54:
-        return 4
-    elif 55 <= index <= 65:
-        return 5
-    elif 66 <= index <= 76:
-        return 6
-    elif 77 <= index <= 87:
-        return 7
+from huggingface_hub import from_pretrained_keras
+
+
+class CganCols:
+    def __init__(self):
+        self.model_0 = from_pretrained_keras('SupawitMarayat/pimthaigans-cgan-0010')
+        self.model_1 = from_pretrained_keras('SupawitMarayat/pimthaigans-cgan-1121')
+        self.model_2 = from_pretrained_keras('SupawitMarayat/pimthaigans-cgan-2232')
+        self.model_3 = from_pretrained_keras('SupawitMarayat/pimthaigans-cgan-3343')
+        self.model_4 = from_pretrained_keras('SupawitMarayat/pimthaigans-cgan-4454')
+        self.model_5 = from_pretrained_keras('SupawitMarayat/pimthaigans-cgan-5565')
+        self.model_6 = from_pretrained_keras('SupawitMarayat/pimthaigans-cgan-6676')
+        self.model_7 = from_pretrained_keras('SupawitMarayat/pimthaigans-cgan-7787')
+
+        self.model_cols = [self.model_0, self.model_1, self.model_2, self.model_3, self.model_4, self.model_5,
+                           self.model_6, self.model_7]
+
+
+def get_model(index: int):
+    """
+    Returns the model based on the given index.
+
+    Index ranges and corresponding model values:
+    0-10   ->  0
+    11-21  ->  1
+    22-32  ->  2
+    33-43  ->  3
+    44-54  ->  4
+    55-65  ->  5
+    66-76  ->  6
+    77-87  ->  7
+
+    :param index: The index value.
+    :return: The corresponding model value.
+    """
+    if 0 <= index <= 10:
+        return 0
+    elif 11 <= index <= 21:
+        return 1
+    elif 22 <= index <= 32:
+        return 2
+    elif 33 <= index <= 43:
+        return 3
+    elif 44 <= index <= 54:
+        return 4
+    elif 55 <= index <= 65:
+        return 5
+    elif 66 <= index <= 76:
+        return 6
+    elif 77 <= index <= 87:
+        return 7

src/libs/s3.py

@@ -1,26 +1,26 @@
-import os
-from dotenv import load_dotenv
-import boto3
-
-load_dotenv(dotenv_path=".env")
-
-
-def s3session():
-    session = boto3.session.Session(
-        aws_access_key_id=os.environ.get("ACCESS_KEY_ID"),
-        aws_secret_access_key=os.environ.get("SECRET_ACCESS_KEY"),
-    )
-
-    return session
-
-
-def s3client():
-    session = s3session()
-    s3_client = session.client("s3")
-    return s3_client
-
-
-def s3resource():
-    session = s3session()
-    s3_resource = session.resource("s3")
-    return s3_resource
+import os
+from dotenv import load_dotenv
+import boto3
+
+load_dotenv(dotenv_path=".env")
+
+
+def s3session():
+    session = boto3.session.Session(
+        aws_access_key_id=os.environ.get("ACCESS_KEY_ID"),
+        aws_secret_access_key=os.environ.get("SECRET_ACCESS_KEY"),
+    )
+
+    return session
+
+
+def s3client():
+    session = s3session()
+    s3_client = session.client("s3")
+    return s3_client
+
+
+def s3resource():
+    session = s3session()
+    s3_resource = session.resource("s3")
+    return s3_resource

src/models/generate.py

@@ -1,14 +1,14 @@
-from typing import List
-from src.models.main import User, Method
-from pydantic import BaseModel, HttpUrl
-
-
-class ImageResult(BaseModel):
-    index: int
-    image_url: HttpUrl
-
-
-class GenerateResult(BaseModel):
-    user: User
-    method: Method
-    result: List[ImageResult]
+from typing import List
+from src.models.main import User, Method
+from pydantic import BaseModel, HttpUrl
+
+
+class ImageResult(BaseModel):
+    index: int
+    image_url: HttpUrl
+
+
+class GenerateResult(BaseModel):
+    user: User
+    method: Method
+    result: List[ImageResult]

src/models/main.py

@@ -1,13 +1,13 @@
-"""Main schema for the Api"""
-from pydantic import BaseModel
-from uuid import UUID
-from enum import Enum
-
-
-class User(BaseModel):
-    uuid: UUID
-
-
-class Method(str, Enum):
-    all = "all"
-    index = "index"
+"""Main schema for the Api"""
+from pydantic import BaseModel
+from uuid import UUID
+from enum import Enum
+
+
+class User(BaseModel):
+    uuid: UUID
+
+
+class Method(str, Enum):
+    all = "all"
+    index = "index"

src/models/view.py

@@ -1,15 +1,15 @@
-from typing import List
-
-from pydantic import BaseModel
-
-from src.models.main import User, Method
-
-
-class ViewImage(BaseModel):
-    index: int
-    image_url: str
-
-class ViewResult(BaseModel):
-    user: User
-    method: Method
+from typing import List
+
+from pydantic import BaseModel
+
+from src.models.main import User, Method
+
+
+class ViewImage(BaseModel):
+    index: int
+    image_url: str
+
+class ViewResult(BaseModel):
+    user: User
+    method: Method
     result: List[ViewImage] | None

test_main.http

@@ -1,11 +1,11 @@
-# Test your FastAPI endpoints
-
-GET http://127.0.0.1:8000/
-Accept: application/json
-
-###
-
-GET http://127.0.0.1:8000/hello/User
-Accept: application/json
-
-###
+# Test your FastAPI endpoints
+
+GET http://127.0.0.1:8000/
+Accept: application/json
+
+###
+
+GET http://127.0.0.1:8000/hello/User
+Accept: application/json
+
+###