Alpha -> Dev (#120)

NeonGeckoCom · Dec 14, 2024 · 72790e6 · 72790e6
1 parent ab5bd5c
commit 72790e6
Show file tree

Hide file tree

Showing 52 changed files with 3,661 additions and 2,906 deletions.
diff --git a/.github/workflows/build_nano_assets.yml b/.github/workflows/build_nano_assets.yml
@@ -0,0 +1,38 @@
+# This workflow will generate a distribution and upload it to PyPI
+
+name: Build Nano Assets
+on:
+  workflow_call:
+
+jobs:
+  build_and_publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref_name }}
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+      - name: Install Setuptools
+        run: |
+          python -m pip install -U pip setuptools
+      - name: Install Build Tools
+        run: |
+          python -m pip install build wheel
+      - name: Install JS Beautifier
+        run: |
+          python -m pip install jsbeautifier==1.15.1
+      - name: Build Nano JS
+        working-directory: ./
+        run: python ./scripts/file_merger.py --working_dir ./chat_client/static --weighted_dirs 1=['js'] --weighted_files 0=['nano_builder.js'] --skip_files meta.js klatchatNano.js --save_to ./js/klatchatNano.js --beautify 1
+      - name: Build Nano CSS
+        working-directory: ./
+        run: python ./scripts/file_merger.py --working_dir ./chat_client/static --weighted_dirs 1=['css'] --skip_files sidebar.css klatchatNano.css --save_to ./css/klatchatNano.css --beautify 0
+      - name: Push Built Files to VCS
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: Built Nano Assets
diff --git a/.github/workflows/bump_dynamic_dependencies.yml b/.github/workflows/bump_dynamic_dependencies.yml
@@ -0,0 +1,43 @@
+# This workflow will generate a distribution and upload it to PyPI
+
+name: Bump Dynamic Dependencies
+on:
+  workflow_call:
+
+jobs:
+  build_and_publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref_name }}
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+      - name: Install Setuptools
+        run: |
+          python -m pip install -U pip setuptools
+      - name: Install Build Tools
+        run: |
+          python -m pip install build wheel
+      - name: Increment Version
+        run: |
+          VER=$(python setup.py --version)
+          python version_bump.py -b ${{ github.ref_name }}
+      - name: Install JS Beautifier
+        if: github.ref == 'refs/heads/alpha'
+        run: |
+          python -m pip install jsbeautifier==1.15.1
+      - name: Build Nano JS
+        if: github.ref == 'refs/heads/alpha'
+        working-directory: ./
+        run: python ./scripts/file_merger.py --working_dir ./chat_client/static --weighted_dirs 1=['js'] --weighted_files 0=['nano_builder.js'] --skip_files meta.js klatchatNano.js --save_to ./js/klatchatNano.js --beautify 1
+      - name: Build Nano CSS
+        if: github.ref == 'refs/heads/alpha'
+        working-directory: ./
+        run: python ./scripts/file_merger.py --working_dir ./chat_client/static --weighted_dirs 1=['css'] --skip_files sidebar.css klatchatNano.css --save_to ./css/klatchatNano.css --beautify 0
+      - name: Push Version Change
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: Updated Version and Dynamic Dependencies
diff --git a/.github/workflows/deploy_containers.yml b/.github/workflows/deploy_containers.yml
@@ -24,11 +24,11 @@ jobs:
     secrets:
       PYKLATCHAT_TESTING_CREDENTIALS_V2: ${{ secrets.PYKLATCHAT_TESTING_CREDENTIALS_V2 }}
       SERVER_ENV: ${{ secrets.SERVER_ENV }}
-  bump-version:
-    uses: ./.github/workflows/publish_version_change.yml
+  bump-dynamic-dependencies:
+    uses: ./.github/workflows/bump_dynamic_dependencies.yml
   publish-images:
     runs-on: ubuntu-latest
-    needs: [run-tests, bump-version]
+    needs: [run-tests, bump-dynamic-dependencies]
     steps:
     - uses: actions/checkout@v4
       with:

diff --git a/.github/workflows/publish_version_change.yml b/.github/workflows/publish_version_change.yml
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -69,3 +69,12 @@ jobs:
       - name: Build Distribution Packages
         run: |
           python setup.py bdist_wheel
+      - name: Install JS Beautifier
+        run: |
+          python -m pip install jsbeautifier==1.15.1
+      - name: Build Nano JS
+        working-directory: ./
+        run: python ./scripts/file_merger.py --working_dir ./chat_client/static --weighted_dirs 1=['js'] --weighted_files 0=['nano_builder.js'] --skip_files meta.js klatchatNano.js --save_to ./js/klatchatNano.js --beautify 1
+      - name: Build Nano CSS
+        working-directory: ./
+        run: python ./scripts/file_merger.py --working_dir ./chat_client/static --weighted_dirs 1=['css'] --skip_files sidebar.css klatchatNano.css --save_to ./css/klatchatNano.css --beautify 0
diff --git a/.gitignore b/.gitignore
@@ -1,19 +1,175 @@
-# Configuration file
-/*config.json
+# Local configs
+/configs/*
+kube_config
+
+# Sandbox
+sandbox.py
 
-# Logs
-/*.log
+# Generated Migration Files
+passed_migrations
 
-# Pycache
-__pycache__
+# Nano generated files
+*Nano
 
-# VS Code
-.vscode
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
 
-# Passed migrations
-passed_migrations
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
 
-# Virtualenv
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
+.pdm.toml
+.pdm-python
+.pdm-build/
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
 .env
-/configs/
-kube_config
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
diff --git a/chat_client/blueprints/chat.py b/chat_client/blueprints/chat.py
@@ -29,7 +29,10 @@
 from fastapi import APIRouter, Request
 from fastapi.templating import Jinja2Templates
 
-from chat_client.client_config import client_config
+from chat_client.client_utils.template_utils import (
+    render_conversation_page,
+    render_nano_page,
+)
 
 router = APIRouter(
     prefix="/chats",
@@ -48,38 +51,24 @@ async def chats(request: Request):
 
     :returns chats template response
     """
-    return conversation_templates.TemplateResponse(
-        "conversation/base.html",
-        {
-            "request": request,
-            "section": "Followed Conversations",
-            "add_sio": True,
-            "redirect_to_https": client_config.get("FORCE_HTTPS", False),
-        },
-    )
+    return render_conversation_page(request=request)
+
+
+@router.get("/live")
+async def live_chats(request: Request):
+    """
+    Renders live chats page HTML as a response related to the input request
+
+    :param request: input Request object
+
+    :returns chats template response
+    """
+    return render_conversation_page(request=request, additional_context={"live": True})
 
 
 @router.get("/nano_demo")
 async def nano_demo(request: Request):
     """
     Minimal working Example of Nano
     """
-    client_url = f'"{request.url.scheme}://{request.url.netloc}"'
-    server_url = f'"{client_config["SERVER_URL"]}"'
-    if client_config.get("FORCE_HTTPS", False):
-        client_url = client_url.replace("http://", "https://")
-        server_url = server_url.replace("http://", "https://")
-    client_url_unquoted = client_url.replace('"', "")
-    return conversation_templates.TemplateResponse(
-        "sample_nano.html",
-        {
-            "request": request,
-            "title": "Nano Demonstration",
-            "description": "Klatchat Nano is injectable JS module, "
-            "allowing to render Klat conversations on any third-party pages, "
-            "supporting essential features.",
-            "server_url": server_url,
-            "client_url": client_url,
-            "client_url_unquoted": client_url_unquoted,
-        },
-    )
+    return render_nano_page(request=request)