fix: merge conflicts

Author: A91y

.github/CODEOWNERS

@@ -0,0 +1,13 @@
+# This is a comment.
+
+# Each line is a file pattern followed by one or more owners.
+
+# These owners will be the default owners for everything in
+
+# the repo. Unless a later match takes precedence,
+
+# @global-owner1 and @global-owner2 will be requested for
+
+# review when someone opens a pull request.
+
+* @Mr-Sunglasses

.github/workflows/mypy.yml

@@ -0,0 +1,22 @@
+name: mypy paste.py 🐍
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup PDM
+        uses: pdm-project/setup-pdm@v3
+        with:
+          python-version: 3.11
+          cache: true
+          cache-dependency-path: "**/pdm.lock"
+      - name: Install dependencies
+        run: pdm install
+      - name: Run mypy
+        run: pdm mypy

.github/workflows/sarthi.yml

@@ -0,0 +1,23 @@
+name: Sarthi Preview Environments
+on:
+  pull_request_target:
+    types: [ opened, closed, reopened, synchronize ]
+  pull_request:
+    types: [ opened, closed, reopened, synchronize ]
+  push:
+  # delete preview environments when branches are deleted
+  delete:
+
+jobs:
+  sarthi_job:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+
+      - name: Set up Sarthi
+        uses: tushar5526/sarthi-deploy@main
+        with:
+          compose_file: docker-compose.yaml # override this with the compose file name
+          sarthi_server_url: ${{ secrets.SARTHI_SERVER_URL }}
+          sarthi_secret: ${{ secrets.SARTHI_SECRET }} # Secret text generate while setting up the server

README.md

@@ -71,7 +71,7 @@ pyenv install 3.11.3
   - **Run the project using docker-compose**:
 
   ```bash
-  docker-compose up -d
+  docker-compose up
   ```
 
 ## Local setup 🛠️ without Docker 🐳

mypy.ini

@@ -0,0 +1,3 @@
+[mypy]
+ignore_missing_imports = True
+disallow_untyped_defs = True

pdm.lock

@@ -19,7 +19,9 @@ license = {text = "MIT"}
 
 [tool.pdm.scripts]
 start = "uvicorn src.paste.main:app --host 0.0.0.0 --port 8080 --workers 4"
+dev = "uvicorn src.paste.main:app --host 0.0.0.0 --port 8080 --reload"
 test = "pytest"
+mypy = "mypy src/paste"
 
 [tool.pdm.dev-dependencies]
 test = [
@@ -33,3 +35,10 @@ lint = [
 hooks = [
     "pre-commit>=3.6.0",
 ]
+typing = [
+    "mypy>=1.8.0",
+]
+
+[tool.ruff]
+line-length = 160
+exclude = ["data/*", ".git"]

pyproject.toml

@@ -0,0 +1,4 @@
+__version__: str = "2.0.0"
+__author__: str = "fosscu"
+__contact__: str = "[email protected]"
+__url__: str = "https://fosscu.org"

src/paste/__init__.py

@@ -1,10 +1,24 @@
-from fastapi import File, UploadFile, HTTPException, status, Request, Form, FastAPI, Header
-from fastapi.responses import PlainTextResponse, HTMLResponse, RedirectResponse, JSONResponse
+from fastapi import (
+    File,
+    UploadFile,
+    HTTPException,
+    status,
+    Request,
+    Form,
+    FastAPI,
+    Header,
+    Response,
+)
+from fastapi.responses import (
+    PlainTextResponse,
+    HTMLResponse,
+    RedirectResponse,
+    JSONResponse,
+)
 import shutil
 import os
 import json
 from pathlib import Path
-from fastapi import FastAPI
 from fastapi.templating import Jinja2Templates
 from fastapi.middleware.cors import CORSMiddleware
 from slowapi.errors import RateLimitExceeded
@@ -16,10 +30,25 @@
 from pygments.lexers import get_lexer_by_name, guess_lexer
 from pygments.formatters import HtmlFormatter
 from pygments.util import ClassNotFound
-from typing import List, Optional, Any
+from typing import List, Optional
+from . import __version__, __author__, __contact__, __url__
+
+description: str = "paste.py 🐍 - A pastebin written in python."
 
 limiter = Limiter(key_func=get_remote_address)
-app: FastAPI = FastAPI(title="paste.py 🐍")
+app: FastAPI = FastAPI(
+    title="paste.py 🐍",
+    version=__version__,
+    contact=dict(
+        name=__author__,
+        url=__url__,
+        email=__contact__,
+    ),
+    license_info=dict(name="MIT", url="https://opensource.org/license/mit/"),
+    openapi_url=None,
+    docs_url=None,
+    redoc_url=None,
+)
 app.state.limiter = limiter
 app.add_exception_handler(RateLimitExceeded, _rate_limit_exceeded_handler)
 
@@ -41,8 +70,7 @@
 
 BASE_DIR: Path = Path(__file__).resolve().parent
 
-templates: Jinja2Templates = Jinja2Templates(
-    directory=str(Path(BASE_DIR, "templates")))
+templates: Jinja2Templates = Jinja2Templates(directory=str(Path(BASE_DIR, "templates")))
 
 
 @app.post("/file")
@@ -54,16 +82,17 @@ async def post_as_a_file(request: Request, file: UploadFile = File(...)) -> Plai
             uuid = generate_uuid()
         # Extract file extension from the filename
         try:
-            file_extension: str = Path(file.filename).suffix[1:]
-            path: str = f"data/{uuid}.{file_extension}"
+            file_extension: Optional[str] = None
+            if file.filename is not None:
+                file_extension = Path(file.filename).suffix[1:]
+            path: str = f"data/{uuid}{file_extension}"
         except Exception:
             path = f"data/{uuid}"
         finally:
             val: str = "/".join(path.split("/")[1:])
         with open(path, "wb") as f:
             shutil.copyfileobj(file.file, f)
             large_uuid_storage.append(uuid)
-            print(large_uuid_storage)
     except Exception:
         raise HTTPException(
             detail="There was an error uploading the file",
@@ -75,7 +104,7 @@ async def post_as_a_file(request: Request, file: UploadFile = File(...)) -> Plai
 
 
 @app.get("/paste/{uuid}")
-async def get_paste_data(uuid: str, user_agent: Optional[str] = Header(None)) -> Any:
+async def get_paste_data(uuid: str, user_agent: Optional[str] = Header(None)) -> Response:
     path: str = f"data/{uuid}"
     try:
         with open(path, "rb") as f:
@@ -97,10 +126,8 @@ async def get_paste_data(uuid: str, user_agent: Optional[str] = Header(None)) ->
                 try:
                     lexer = get_lexer_by_name(file_extension, stripall=True)
                 except ClassNotFound:
-                    lexer = get_lexer_by_name(
-                        "text", stripall=True)  # Default lexer
-            formatter = HtmlFormatter(
-                style="colorful", full=True, linenos="inline", cssclass='code')
+                    lexer = get_lexer_by_name("text", stripall=True)  # Default lexer
+            formatter = HtmlFormatter(style="colorful", full=True, linenos="inline", cssclass="code")
             highlighted_code: str = highlight(content, lexer, formatter)
             # print(highlighted_code)
             custom_style = """
@@ -194,19 +221,16 @@ async def get_paste_data(uuid: str, user_agent: Optional[str] = Header(None)) ->
                     </script>
                 </html>
                 """
-            return HTMLResponse(
-                content=response_content
-            )
-    except Exception as e:
-        print(e)
+            return HTMLResponse(content=response_content)
+    except Exception:
         raise HTTPException(
             detail="404: The Requested Resource is not found",
             status_code=status.HTTP_404_NOT_FOUND,
         )
 
 
 @app.get("/", response_class=HTMLResponse)
-async def indexpage(request: Request) -> HTMLResponse:
+async def indexpage(request: Request) -> Response:
     return templates.TemplateResponse("index.html", {"request": request})
 
 
@@ -217,25 +241,19 @@ async def delete_paste(uuid: str) -> PlainTextResponse:
         os.remove(path)
         return PlainTextResponse(f"File successfully deleted {uuid}")
     except FileNotFoundError:
-        raise HTTPException(
-            detail="File Not Found", status_code=status.HTTP_404_NOT_FOUND
-        )
+        raise HTTPException(detail="File Not Found", status_code=status.HTTP_404_NOT_FOUND)
     except Exception as e:
-        raise HTTPException(
-            detail=f"The exception is {e}", status_code=status.HTTP_409_CONFLICT
-        )
+        raise HTTPException(detail=f"The exception is {e}", status_code=status.HTTP_409_CONFLICT)
 
 
 @app.get("/web", response_class=HTMLResponse)
-async def web(request: Request) -> HTMLResponse:
+async def web(request: Request) -> Response:
     return templates.TemplateResponse("web.html", {"request": request})
 
 
 @app.post("/web", response_class=PlainTextResponse)
 @limiter.limit("100/minute")
-async def web_post(
-    request: Request, content: str = Form(...), extension: Optional[str] = Form(None)
-) -> RedirectResponse:
+async def web_post(request: Request, content: str = Form(...), extension: Optional[str] = Form(None)) -> RedirectResponse:
     try:
         file_content: bytes = content.encode()
         uuid: str = generate_uuid()
@@ -249,16 +267,13 @@ async def web_post(
         with open(path, "wb") as f:
             f.write(file_content)
             large_uuid_storage.append(uuid_)
-    except Exception as e:
-        print(e)
+    except Exception:
         raise HTTPException(
             detail="There was an error uploading the file",
             status_code=status.HTTP_403_FORBIDDEN,
         )
 
-    return RedirectResponse(
-        f"{BASE_URL}/paste/{uuid_}", status_code=status.HTTP_303_SEE_OTHER
-    )
+    return RedirectResponse(f"{BASE_URL}/paste/{uuid_}", status_code=status.HTTP_303_SEE_OTHER)
 
 
 @app.get("/health", status_code=status.HTTP_200_OK)

src/paste/main.py

@@ -1,15 +1,18 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-      <title>paste.py 🐍</title>
-      <meta charset="UTF-8"/>
-      <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-      <meta name="og:title" content="paste.py 🐍"/>
-      <meta name="og:site_name" content="paste.py"/>
-      <meta name="og:description" content="A simple pastebin powered by FastAPI."/>
-      <meta name="og:type" content="website"/>
-      <meta name="og:url" content="https://paste.fosscu.org"/>
-      <meta name="og:locale" content="en_US"/>
+    <title>paste.py 🐍</title>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="og:title" content="paste.py 🐍" />
+    <meta name="og:site_name" content="paste.py" />
+    <meta
+      name="og:description"
+      content="A simple pastebin powered by FastAPI."
+    />
+    <meta name="og:type" content="website" />
+    <meta name="og:url" content="https://paste.fosscu.org" />
+    <meta name="og:locale" content="en_US" />
     <style>
       body {
         font-family: sans-serif;
@@ -109,7 +112,7 @@ <h3>EXAMPLES</h3>
     A shell function that can be added to <strong>.bashrc</strong> or <strong>.bash_profle</strong> or <strong>.zshrc</strong> for
     quick pasting from the command line. The command takes a filename or reads
     from stdin if none was supplied and outputs the URL of the paste to
-    stdout: <pre>paste file.txt</pre> or <pre>echo "hi" | paste</pre></p>
+    stdout: <pre>paste file.txt</pre> <!-- or <pre>echo "hi" | paste</pre></p> -->
 
 
 </pre>