From 554070cb52dd0cee0a38866a944b5fbf4c6db94a Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Thu, 28 Sep 2023 12:34:04 +0530
Subject: [PATCH 01/27] Added signals and handler for project data change

Handler triggers a generate thumnail method using the html2image module.
- CSS styling to the added to the template.
- Project models needs a new column for BYTEA data
- A method to add the generated image to the new BYTEA column needs to be added
- Cache headers have to be set in the view to tell Nginx to the cache the date
---
 funnel/signals.py                       |   3 +
 funnel/templates/thumbnail_preview.html |  26 +++
 funnel/views/project.py                 |   5 +-
 funnel/views/thumnbnails.py             |  27 +++
 requirements.txt                        | 296 ++++++++++++++++++++++++
 5 files changed, 356 insertions(+), 1 deletion(-)
 create mode 100644 funnel/templates/thumbnail_preview.html
 create mode 100644 funnel/views/thumnbnails.py
 create mode 100644 requirements.txt
diff --git a/funnel/signals.py b/funnel/signals.py
index 8681036f1..a6b45f897 100644
--- a/funnel/signals.py
+++ b/funnel/signals.py
@@ -60,3 +60,6 @@
 # Commentset role change signals (sends user, document)
 project_role_change = app_signals.signal('project_role_change')
 proposal_role_change = app_signals.signal('proposal_role_change')
+
+# Project data change signal
+project_data_change = app_signals.signal('project_data_change')
diff --git a/funnel/templates/thumbnail_preview.html b/funnel/templates/thumbnail_preview.html
new file mode 100644
index 000000000..f14af8858
--- /dev/null
+++ b/funnel/templates/thumbnail_preview.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" type="text/css" href="{{ manifest('css/app.css') }}" />
+    <link rel="stylesheet" type="text/css" href="{{ manifest('css/project.css') }}" />
+  </head>
+  <body>
+    <main>
+      <div class="main-wrapper">
+        <div class="title-wrapper">
+          <h5>{{project.account.title}}</h5>
+          <h1 class="post-title">
+            {{ project.title }}
+          </h1>
+          <div class="mui--text-heading mui--text-light zero-bottom-margin">
+            {{ project.tagline }}
+          </div>
+        </div>
+          {{ project.datelocation }}
+          {{ project.primary_venue }}
+      </div>
+    </main>
+  </body>
+</html>
diff --git a/funnel/views/project.py b/funnel/views/project.py
index 94a1e10f7..63db7b199 100644
--- a/funnel/views/project.py
+++ b/funnel/views/project.py
@@ -48,7 +48,7 @@
     db,
     sa,
 )
-from ..signals import project_role_change
+from ..signals import project_role_change, project_data_change
 from ..typing import ReturnRenderWith, ReturnView
 from .helpers import html_in_json, render_redirect
 from .jobs import import_tickets, tag_locations
@@ -283,6 +283,8 @@ def new_project(self) -> ReturnView:
 
             flash(_("Your new project has been created"), 'info')
 
+            project_data_change.send(self.obj)
+
             # tag locations
             tag_locations.queue(project.id)
 
@@ -455,6 +457,7 @@ def edit(self) -> ReturnView:
             db.session.commit()
             flash(_("Your changes have been saved"), 'info')
             tag_locations.queue(self.obj.id)
+            project_data_change.send(self.obj)
 
             # Find and delete draft if it exists
             if self.get_draft() is not None:
diff --git a/funnel/views/thumnbnails.py b/funnel/views/thumnbnails.py
new file mode 100644
index 000000000..ba129cd36
--- /dev/null
+++ b/funnel/views/thumnbnails.py
@@ -0,0 +1,27 @@
+"""View for autogenerating thumbnail previews"""
+
+from flask import render_template
+from html2image import Html2Image
+from ..models import (
+    Account,
+    Project,
+)
+from .jobs import rqjob
+from ..signals import project_data_change
+
+
+thumbnail = Html2Image(size=(1067, 600))
+
+
+@project_data_change.connect
+def generate_thumbnail_image(project = Project) -> None:
+    render_thumbnail_image(project = project)
+
+@rqjob()
+def render_thumbnail_image(project = Project) -> None:
+    """Render the thumbnail image and cache the file using a background task"""
+
+    image_html = render_template('thumbnail_preview.html.jinja2', project = project )
+
+    thumbnail_image = thumbnail.screenshot(html_str=image_html, save_as='thumbnail.png',
+                                           size=(1067, 600))
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 000000000..b7541b8ea
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,296 @@
+aiohttp==3.8.5
+aiohttp-retry==2.8.3
+aiosignal==1.3.1
+alembic==1.12.0
+aniso8601==9.0.1
+anyio==4.0.0
+argon2-cffi==23.1.0
+argon2-cffi-bindings==21.2.0
+arrow==1.2.3
+astroid==2.15.6
+async-timeout==4.0.3
+attrs==23.1.0
+Babel==2.12.1
+bandit==1.7.5
+base58==2.1.1
+-e git+https://github.com/hasgeek/baseframe.git@84d2d87ba1fdcc9945bc80ab11f43c7627a372d8#egg=baseframe
+bcrypt==4.0.1
+beautifulsoup4==4.12.2
+better-profanity==0.6.1
+black==23.7.0
+bleach==6.0.0
+blinker==1.6.2
+boto3==1.28.43
+botocore==1.31.43
+Brotli==1.1.0
+build==1.0.3
+cachelib==0.9.0
+cachetools==5.3.1
+cattrs==22.1.0
+certifi==2023.7.22
+cffi==1.15.1
+cfgv==3.4.0
+chardet==5.2.0
+charset-normalizer==3.2.0
+chevron==0.14.0
+click==8.1.7
+-e git+https://github.com/hasgeek/coaster.git@d9e84f51dedb3a7863e1c3d1b0608c55c777f079#egg=coaster
+colorama==0.4.6
+coverage==6.5.0
+coveralls==3.3.1
+crontab==1.0.1
+cryptography==41.0.3
+cssbeautifier==1.14.9
+cssmin==0.2.0
+cssselect==1.2.0
+cssutils==2.7.1
+dataclasses-json==0.6.0
+dill==0.3.7
+distlib==0.3.7
+djlint==1.32.1
+dnspython==2.4.2
+docopt==0.6.2
+EditorConfig==0.12.3
+emoji==2.8.0
+exceptiongroup==1.1.3
+filelock==3.12.3
+flake8==6.1.0
+flake8-annotations==3.0.1
+flake8-assertive==2.1.0
+flake8-blind-except==0.2.1
+flake8-bugbear==23.7.10
+flake8-builtins==2.1.0
+flake8-comprehensions==3.14.0
+flake8-docstrings==1.7.0
+flake8-isort==6.0.0
+flake8-logging-format==0.9.0
+flake8-mutable==1.2.0
+flake8-plugin-utils==1.3.3
+flake8-print==5.0.0
+flake8-pytest-style==1.7.2
+Flask==2.3.3
+Flask-Admin==1.6.1
+Flask-Assets==2.0
+flask-babel==3.1.0
+Flask-Caching==2.0.2
+Flask-DebugToolbar==0.13.1
+Flask-Executor==1.0.0
+Flask-FlatPages==0.8.1
+Flask-Lastuser @ git+https://github.com/hasgeek/flask-lastuser@173a1c437068bfbec6912846390ea691801c973d
+Flask-Mail==0.9.1
+flask-mailman==0.3.0
+Flask-Migrate==4.0.4
+flask-redis==0.4.0
+Flask-RQ2==18.3
+Flask-SQLAlchemy==3.0.5
+Flask-WTF==1.1.1
+freezegun==1.2.2
+frozenlist==1.4.0
+furl==2.1.3
+future==0.18.3
+geoip2==4.7.0
+gherkin-official==24.0.0
+gitdb==4.0.10
+GitPython==3.1.35
+grapheme==0.6.0
+gunicorn==21.2.0
+h11==0.14.0
+h2==4.1.0
+hpack==4.0.0
+html-tag-names==0.1.2
+html-void-elements==0.1.0
+html2image==2.0.4.3
+html2text==2020.1.16
+html5lib==1.1
+html5print==0.1.2
+htmlmin==0.1.12
+httpcore==0.17.3
+httplib2==0.22.0
+httpx==0.24.1
+hyperframe==6.0.1
+icalendar==5.0.7
+identify==2.5.27
+idna==3.4
+ijson==3.2.3
+importlib-metadata==6.8.0
+iniconfig==2.0.0
+install==1.3.5
+isort==5.12.0
+isoweek==1.3.3
+itsdangerous==2.1.2
+Jinja2==3.1.2
+jmespath==1.0.1
+joblib==1.3.2
+jsbeautifier==1.14.9
+jsmin==3.0.1
+json5==0.9.14
+lazy-object-proxy==1.9.0
+lesscpy==0.15.1
+linkify-it-py==2.0.2
+lxml==4.9.3
+lxml-stubs==0.4.0
+Mako==1.2.4
+Markdown==3.4.4
+markdown-it-py==3.0.0
+MarkupSafe==2.1.3
+marshmallow==3.20.1
+maxminddb==2.4.0
+mccabe==0.7.0
+mdit-py-plugins==0.4.0
+mdurl==0.1.2
+mkdocs-material-extensions==1.1.1
+multidict==6.0.4
+mxsniff==0.3.5
+mypy==1.5.1
+mypy-extensions==1.0.0
+mypy-json-report==1.0.4
+nltk==3.8.1
+nodeenv==1.8.0
+oauth2==1.9.0.post1
+oauth2client==4.1.3
+oauthlib==3.2.2
+orderedmultidict==1.0.1
+outcome==1.2.0
+packaging==23.1
+parse==1.19.1
+parse-type==0.6.2
+passlib==1.7.4
+pathspec==0.11.2
+pbr==5.11.1
+pep8-naming==0.13.3
+phonenumbers==8.13.20
+pip-compile-multi==2.6.3
+pip-tools==7.3.0
+platformdirs==3.10.0
+pluggy==1.3.0
+ply==3.11
+po2json==0.2.2
+pre-commit==3.4.0
+premailer==3.10.0
+progressbar2==4.2.0
+psycopg==3.1.10
+psycopg-binary==3.1.10
+psycopg2-binary==2.9.7
+py==1.11.0
+pyasn1==0.5.0
+pyasn1-modules==0.3.0
+pycodestyle==2.11.0
+pycountry==22.3.5
+pycparser==2.21
+pydocstyle==6.3.0
+pyflakes==3.1.0
+Pygments==2.16.1
+pyIsEmail==2.0.1
+PyJWT==2.8.0
+pylint==2.17.5
+pymdown-extensions==10.3
+pyparsing==3.1.1
+pypng==0.20220715.0
+pyproject_hooks==1.0.0
+PySocks==1.7.1
+pytest==7.4.2
+pytest-asyncio==0.21.1
+pytest-base-url==2.0.0
+pytest-bdd==6.1.1
+pytest-cov==4.1.0
+pytest-dotenv==0.5.2
+pytest-env==1.0.1
+pytest-html==4.0.0
+pytest-metadata==3.0.0
+pytest-rerunfailures==12.0
+pytest-selenium==4.0.1
+pytest-socket==0.6.0
+pytest-variables==3.0.0
+python-dateutil==2.8.2
+python-dotenv==1.0.0
+python-telegram-bot==20.5
+python-utils==3.7.0
+pytz==2023.3.post1
+pyupgrade==3.10.1
+PyVimeo==1.1.0
+PyYAML==6.0.1
+qrcode==7.4.2
+rcssmin==1.1.1
+redis==5.0.0
+Redis-Sentinel-Url==1.0.1
+reformat-gherkin==3.0.1
+regex==2023.8.8
+requests==2.31.0
+requests-file==1.5.1
+requests-mock==1.11.0
+requests-oauthlib==1.3.1
+respx==0.20.2
+rich==13.5.2
+rq==1.15.1
+rq-dashboard @ git+https://github.com/jace/rq-dashboard@a3d4ba50cc796642057ed65061f646b7ca417465
+rq-scheduler==0.13.1
+rsa==4.9
+ruff==0.0.287
+s3transfer==0.6.2
+selenium==4.9.1
+semantic-version==2.10.0
+sentry-sdk==1.30.0
+six==1.16.0
+slimit==0.8.1
+smmap==5.0.0
+sniffio==1.3.0
+snowballstemmer==2.2.0
+sortedcontainers==2.4.0
+soupsieve==2.5
+SQLAlchemy==2.0.20
+sqlalchemy-json==0.7.0
+SQLAlchemy-Utils==0.41.1
+statsd==4.0.1
+stevedore==5.1.0
+sttable==0.0.1
+tenacity==8.2.3
+tinycss2==1.2.1
+tinydb==4.8.0
+tldextract==3.5.0
+tokenize-rt==5.2.0
+toml==0.10.2
+tomli==2.0.1
+tomlkit==0.12.1
+toposort==1.10
+tqdm==4.66.1
+trio==0.22.2
+trio-websocket==0.10.4
+tuspy==1.0.1
+tweepy==4.14.0
+twilio==8.8.0
+typeguard==4.1.3
+types-chevron==0.14.2.5
+types-geoip2==3.0.0
+types-ipaddress==1.0.8
+types-maxminddb==1.5.0
+types-mock==5.1.0.2
+types-pyOpenSSL==23.2.0.2
+types-python-dateutil==2.8.19.14
+types-pytz==2023.3.0.1
+types-redis==4.6.0.5
+types-requests==2.31.0.2
+types-urllib3==1.26.25.14
+typing-inspect==0.9.0
+typing_extensions==4.7.1
+ua-parser==0.18.0
+uc-micro-py==1.0.2
+Unidecode==1.3.6
+urllib3==1.26.16
+user-agents==2.2.0
+virtualenv==20.24.4
+wcwidth==0.2.6
+webassets==2.0
+webencodings==0.5.1
+websocket-client==1.6.3
+Werkzeug==2.3.7
+whitenoise==6.5.0
+wrapt==1.15.0
+wsproto==1.2.0
+WTForms==3.0.1
+WTForms-JSON==0.3.5
+WTForms-SQLAlchemy==0.3
+xxhash==3.3.0
+yarl==1.9.2
+z-base-32==0.1.2
+zipp==3.16.2
+zxcvbn==4.4.28

From 64a4f4fc305fc72cef8a336970527acfd8bf8bbf Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 28 Sep 2023 07:19:51 +0000
Subject: [PATCH 02/27] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 funnel/templates/thumbnail_preview.html | 13 +++++--------
 funnel/views/project.py                 |  2 +-
 funnel/views/thumnbnails.py             | 21 +++++++++------------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/funnel/templates/thumbnail_preview.html b/funnel/templates/thumbnail_preview.html
index f14af8858..a58adf232 100644
--- a/funnel/templates/thumbnail_preview.html
+++ b/funnel/templates/thumbnail_preview.html
@@ -1,8 +1,8 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="stylesheet" type="text/css" href="{{ manifest('css/app.css') }}" />
     <link rel="stylesheet" type="text/css" href="{{ manifest('css/project.css') }}" />
   </head>
@@ -11,15 +11,12 @@
       <div class="main-wrapper">
         <div class="title-wrapper">
           <h5>{{project.account.title}}</h5>
-          <h1 class="post-title">
-            {{ project.title }}
-          </h1>
+          <h1 class="post-title">{{ project.title }}</h1>
           <div class="mui--text-heading mui--text-light zero-bottom-margin">
             {{ project.tagline }}
           </div>
         </div>
-          {{ project.datelocation }}
-          {{ project.primary_venue }}
+        {{ project.datelocation }} {{ project.primary_venue }}
       </div>
     </main>
   </body>
diff --git a/funnel/views/project.py b/funnel/views/project.py
index 63db7b199..5fd5887db 100644
--- a/funnel/views/project.py
+++ b/funnel/views/project.py
@@ -48,7 +48,7 @@
     db,
     sa,
 )
-from ..signals import project_role_change, project_data_change
+from ..signals import project_data_change, project_role_change
 from ..typing import ReturnRenderWith, ReturnView
 from .helpers import html_in_json, render_redirect
 from .jobs import import_tickets, tag_locations
diff --git a/funnel/views/thumnbnails.py b/funnel/views/thumnbnails.py
index ba129cd36..111ba753d 100644
--- a/funnel/views/thumnbnails.py
+++ b/funnel/views/thumnbnails.py
@@ -2,26 +2,23 @@
 
 from flask import render_template
 from html2image import Html2Image
-from ..models import (
-    Account,
-    Project,
-)
-from .jobs import rqjob
-from ..signals import project_data_change
 
+from ..models import Project
+from ..signals import project_data_change
+from .jobs import rqjob
 
 thumbnail = Html2Image(size=(1067, 600))
 
 
 @project_data_change.connect
-def generate_thumbnail_image(project = Project) -> None:
-    render_thumbnail_image(project = project)
+def generate_thumbnail_image(project=Project) -> None:
+    render_thumbnail_image(project=project)
+
 
 @rqjob()
-def render_thumbnail_image(project = Project) -> None:
+def render_thumbnail_image(project=Project) -> None:
     """Render the thumbnail image and cache the file using a background task"""
 
-    image_html = render_template('thumbnail_preview.html.jinja2', project = project )
+    image_html = render_template('thumbnail_preview.html.jinja2', project=project)
 
-    thumbnail_image = thumbnail.screenshot(html_str=image_html, save_as='thumbnail.png',
-                                           size=(1067, 600))
+    thumbnail.screenshot(html_str=image_html, save_as='thumbnail.png', size=(1067, 600))

From 43b41b39df69da45898237f2675d3bd70d43bb93 Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Thu, 28 Sep 2023 18:59:37 +0530
Subject: [PATCH 03/27] Added a column for thumbnail_images in the project
 model

-Ran db migration
-Generate thumbnail method writes png to the db
---
 funnel/models/project.py                      |   8 +
 funnel/signals.py                             |   2 +-
 ...iew.html => thumbnail_preview.html.jinja2} |   0
 funnel/views/project.py                       |   6 +-
 funnel/views/thumnbnails.py                   |  18 +-
 ...dded_thumbnail_image_column_to_project_.py | 187 ++++++++++++++++++
 6 files changed, 208 insertions(+), 13 deletions(-)
 rename funnel/templates/{thumbnail_preview.html => thumbnail_preview.html.jinja2} (100%)
 create mode 100644 migrations/versions/8750fd8f82de_added_thumbnail_image_column_to_project_.py

diff --git a/funnel/models/project.py b/funnel/models/project.py
index 5bf0787bc..ae7256f74 100644
--- a/funnel/models/project.py
+++ b/funnel/models/project.py
@@ -5,6 +5,7 @@
 from collections.abc import Sequence
 
 from pytz import utc
+from sqlalchemy import LargeBinary
 from sqlalchemy.orm import attribute_keyed_dict
 from werkzeug.utils import cached_property
 
@@ -191,6 +192,13 @@ class Project(UuidMixin, BaseScopedNameMixin, Model):
         read={'all'},
         datasets={'primary', 'without_parent', 'related'},
     )
+
+    thumbnail_image = with_roles(
+        sa.orm.mapped_column(LargeBinary, nullable=True),
+        read={'all'},
+        datasets={'primary', 'without_parent', 'related'},
+    )
+
     allow_rsvp: Mapped[bool] = with_roles(
         sa.orm.mapped_column(sa.Boolean, default=True, nullable=False),
         read={'all'},
diff --git a/funnel/signals.py b/funnel/signals.py
index a6b45f897..4fa1fbb42 100644
--- a/funnel/signals.py
+++ b/funnel/signals.py
@@ -55,6 +55,7 @@
 user_data_changed = app_signals.signal('user-data-changed')
 org_data_changed = app_signals.signal('org-data-changed')
 team_data_changed = app_signals.signal('team-data-changed')
+project_data_changed = app_signals.signal('project_data_changed')
 session_revoked = app_signals.signal('session-revoked')
 
 # Commentset role change signals (sends user, document)
@@ -62,4 +63,3 @@
 proposal_role_change = app_signals.signal('proposal_role_change')
 
 # Project data change signal
-project_data_change = app_signals.signal('project_data_change')
diff --git a/funnel/templates/thumbnail_preview.html b/funnel/templates/thumbnail_preview.html.jinja2
similarity index 100%
rename from funnel/templates/thumbnail_preview.html
rename to funnel/templates/thumbnail_preview.html.jinja2
diff --git a/funnel/views/project.py b/funnel/views/project.py
index 63db7b199..fc7fda3d6 100644
--- a/funnel/views/project.py
+++ b/funnel/views/project.py
@@ -48,7 +48,7 @@
     db,
     sa,
 )
-from ..signals import project_role_change, project_data_change
+from ..signals import project_role_change, project_data_changed
 from ..typing import ReturnRenderWith, ReturnView
 from .helpers import html_in_json, render_redirect
 from .jobs import import_tickets, tag_locations
@@ -283,7 +283,7 @@ def new_project(self) -> ReturnView:
 
             flash(_("Your new project has been created"), 'info')
 
-            project_data_change.send(self.obj)
+            project_data_changed.send(self.obj, changes=['new'])
 
             # tag locations
             tag_locations.queue(project.id)
@@ -457,7 +457,7 @@ def edit(self) -> ReturnView:
             db.session.commit()
             flash(_("Your changes have been saved"), 'info')
             tag_locations.queue(self.obj.id)
-            project_data_change.send(self.obj)
+            project_data_changed.send(self.obj, changes=['edit'])
 
             # Find and delete draft if it exists
             if self.get_draft() is not None:
diff --git a/funnel/views/thumnbnails.py b/funnel/views/thumnbnails.py
index ba129cd36..8503c2acb 100644
--- a/funnel/views/thumnbnails.py
+++ b/funnel/views/thumnbnails.py
@@ -2,18 +2,15 @@
 
 from flask import render_template
 from html2image import Html2Image
-from ..models import (
-    Account,
-    Project,
-)
+from ..models import Project, db
 from .jobs import rqjob
-from ..signals import project_data_change
+from ..signals import project_data_changed
 
 
-thumbnail = Html2Image(size=(1067, 600))
+thumbnail = Html2Image(size=(640, 360))
 
 
-@project_data_change.connect
+@project_data_changed.connect
 def generate_thumbnail_image(project = Project) -> None:
     render_thumbnail_image(project = project)
 
@@ -23,5 +20,8 @@ def render_thumbnail_image(project = Project) -> None:
 
     image_html = render_template('thumbnail_preview.html.jinja2', project = project )
 
-    thumbnail_image = thumbnail.screenshot(html_str=image_html, save_as='thumbnail.png',
-                                           size=(1067, 600))
+    thumbnail_image = thumbnail.screenshot(html_str=image_html, save_as=f'{project.id}_thumbnail.png', size=(640, 360))
+
+    project.thumbnail_image = thumbnail_image
+    db.session.add(project)
+    db.session.commit()
diff --git a/migrations/versions/8750fd8f82de_added_thumbnail_image_column_to_project_.py b/migrations/versions/8750fd8f82de_added_thumbnail_image_column_to_project_.py
new file mode 100644
index 000000000..e88b831cb
--- /dev/null
+++ b/migrations/versions/8750fd8f82de_added_thumbnail_image_column_to_project_.py
@@ -0,0 +1,187 @@
+"""Added thumbnail_image column to Project model
+
+Revision ID: 8750fd8f82de
+Revises: 4f9ca10b7b9d
+Create Date: 2023-09-28 18:47:07.517533
+
+"""
+
+from typing import Optional, Tuple, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = '8750fd8f82de'
+down_revision: str = '4f9ca10b7b9d'
+branch_labels: Optional[Union[str, Tuple[str, ...]]] = None
+depends_on: Optional[Union[str, Tuple[str, ...]]] = None
+
+
+def upgrade(engine_name: str = '') -> None:
+    """Upgrade all databases."""
+    # Do not modify. Edit `upgrade_` instead
+    globals().get(f'upgrade_{engine_name}', lambda: None)()
+
+
+def downgrade(engine_name: str = '') -> None:
+    """Downgrade all databases."""
+    # Do not modify. Edit `downgrade_` instead
+    globals().get(f'downgrade_{engine_name}', lambda: None)()
+
+
+
+
+
+def upgrade_() -> None:
+    """Upgrade default database."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('project', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('thumbnail_image', sa.LargeBinary(), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade_() -> None:
+    """Downgrade default database."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('project', schema=None) as batch_op:
+        batch_op.drop_column('thumbnail_image')
+
+    # ### end Alembic commands ###
+
+
+def upgrade_geoname() -> None:
+    """Upgrade geoname database."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('geo_country_info',
+    sa.Column('iso_alpha2', sa.CHAR(length=2), nullable=True),
+    sa.Column('iso_alpha3', sa.CHAR(length=3), nullable=True),
+    sa.Column('iso_numeric', sa.Integer(), nullable=True),
+    sa.Column('fips_code', sa.Unicode(length=3), nullable=True),
+    sa.Column('capital', sa.String(), nullable=True),
+    sa.Column('area_in_sqkm', sa.Numeric(), nullable=True),
+    sa.Column('population', sa.BigInteger(), nullable=True),
+    sa.Column('continent', sa.CHAR(length=2), nullable=True),
+    sa.Column('tld', sa.Unicode(length=3), nullable=True),
+    sa.Column('currency_code', sa.CHAR(length=3), nullable=True),
+    sa.Column('currency_name', sa.String(), nullable=True),
+    sa.Column('phone', sa.Unicode(length=16), nullable=True),
+    sa.Column('postal_code_format', sa.Unicode(), nullable=True),
+    sa.Column('postal_code_regex', sa.Unicode(), nullable=True),
+    sa.Column('languages', postgresql.ARRAY(sa.Unicode(), dimensions=1), nullable=True),
+    sa.Column('neighbours', postgresql.ARRAY(sa.CHAR(length=2), dimensions=1), nullable=True),
+    sa.Column('equivalent_fips_code', sa.Unicode(length=3), nullable=False),
+    sa.Column('name', sa.Unicode(length=250), nullable=False),
+    sa.Column('title', sa.Unicode(length=250), nullable=False),
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
+    sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('iso_alpha2'),
+    sa.UniqueConstraint('iso_alpha3'),
+    sa.UniqueConstraint('name')
+    )
+    with op.batch_alter_table('geo_country_info', schema=None) as batch_op:
+        batch_op.create_index('ix_geo_country_info_title', [sa.text("lower('title')")], unique=False, postgresql_ops={'title_lower': 'varchar_pattern_ops'})
+
+    op.create_table('geo_admin1_code',
+    sa.Column('title', sa.Unicode(), nullable=True),
+    sa.Column('ascii_title', sa.Unicode(), nullable=True),
+    sa.Column('country', sa.CHAR(length=2), nullable=True),
+    sa.Column('admin1_code', sa.Unicode(), nullable=True),
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
+    sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
+    sa.ForeignKeyConstraint(['country'], ['geo_country_info.iso_alpha2'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('geo_admin2_code',
+    sa.Column('title', sa.Unicode(), nullable=True),
+    sa.Column('ascii_title', sa.Unicode(), nullable=True),
+    sa.Column('country', sa.CHAR(length=2), nullable=True),
+    sa.Column('admin1_code', sa.Unicode(), nullable=True),
+    sa.Column('admin2_code', sa.Unicode(), nullable=True),
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
+    sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
+    sa.ForeignKeyConstraint(['country'], ['geo_country_info.iso_alpha2'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('geo_name',
+    sa.Column('ascii_title', sa.Unicode(), nullable=True),
+    sa.Column('latitude', sa.Numeric(), nullable=True),
+    sa.Column('longitude', sa.Numeric(), nullable=True),
+    sa.Column('fclass', sa.CHAR(length=1), nullable=True),
+    sa.Column('fcode', sa.Unicode(), nullable=True),
+    sa.Column('country', sa.CHAR(length=2), nullable=True),
+    sa.Column('cc2', sa.Unicode(), nullable=True),
+    sa.Column('admin1', sa.Unicode(), nullable=True),
+    sa.Column('admin1_id', sa.Integer(), nullable=True),
+    sa.Column('admin2', sa.Unicode(), nullable=True),
+    sa.Column('admin2_id', sa.Integer(), nullable=True),
+    sa.Column('admin4', sa.Unicode(), nullable=True),
+    sa.Column('admin3', sa.Unicode(), nullable=True),
+    sa.Column('population', sa.BigInteger(), nullable=True),
+    sa.Column('elevation', sa.Integer(), nullable=True),
+    sa.Column('dem', sa.Integer(), nullable=True),
+    sa.Column('timezone', sa.Unicode(), nullable=True),
+    sa.Column('moddate', sa.Date(), nullable=True),
+    sa.Column('name', sa.Unicode(length=250), nullable=False),
+    sa.Column('title', sa.Unicode(length=250), nullable=False),
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
+    sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
+    sa.ForeignKeyConstraint(['admin1_id'], ['geo_admin1_code.id'], ),
+    sa.ForeignKeyConstraint(['admin2_id'], ['geo_admin2_code.id'], ),
+    sa.ForeignKeyConstraint(['country'], ['geo_country_info.iso_alpha2'], ),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('name')
+    )
+    with op.batch_alter_table('geo_name', schema=None) as batch_op:
+        batch_op.create_index('ix_geo_name_ascii_title', [sa.text('lower(ascii_title)')], unique=False, postgresql_ops={'ascii_title_lower': 'varchar_pattern_ops'})
+        batch_op.create_index('ix_geo_name_title', [sa.text("lower('title')")], unique=False, postgresql_ops={'title_lower': 'varchar_pattern_ops'})
+
+    op.create_table('geo_alt_name',
+    sa.Column('geonameid', sa.Integer(), nullable=False),
+    sa.Column('lang', sa.Unicode(), nullable=True),
+    sa.Column('title', sa.Unicode(), nullable=False),
+    sa.Column('is_preferred_name', sa.Boolean(), nullable=False),
+    sa.Column('is_short_name', sa.Boolean(), nullable=False),
+    sa.Column('is_colloquial', sa.Boolean(), nullable=False),
+    sa.Column('is_historic', sa.Boolean(), nullable=False),
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
+    sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
+    sa.ForeignKeyConstraint(['geonameid'], ['geo_name.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    with op.batch_alter_table('geo_alt_name', schema=None) as batch_op:
+        batch_op.create_index(batch_op.f('ix_geo_alt_name_lang'), ['lang'], unique=False)
+        batch_op.create_index('ix_geo_alt_name_title', [sa.text("lower('title')")], unique=False, postgresql_ops={'title_lower': 'varchar_pattern_ops'})
+
+    # ### end Alembic commands ###
+
+
+def downgrade_geoname() -> None:
+    """Downgrade geoname database."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('geo_alt_name', schema=None) as batch_op:
+        batch_op.drop_index('ix_geo_alt_name_title', postgresql_ops={'title_lower': 'varchar_pattern_ops'})
+        batch_op.drop_index(batch_op.f('ix_geo_alt_name_lang'))
+
+    op.drop_table('geo_alt_name')
+    with op.batch_alter_table('geo_name', schema=None) as batch_op:
+        batch_op.drop_index('ix_geo_name_title', postgresql_ops={'title_lower': 'varchar_pattern_ops'})
+        batch_op.drop_index('ix_geo_name_ascii_title', postgresql_ops={'ascii_title_lower': 'varchar_pattern_ops'})
+
+    op.drop_table('geo_name')
+    op.drop_table('geo_admin2_code')
+    op.drop_table('geo_admin1_code')
+    with op.batch_alter_table('geo_country_info', schema=None) as batch_op:
+        batch_op.drop_index('ix_geo_country_info_title', postgresql_ops={'title_lower': 'varchar_pattern_ops'})
+
+    op.drop_table('geo_country_info')
+    # ### end Alembic commands ###
+

From e44756f437bace7fd407c86be8bd436eb1d957a0 Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Thu, 28 Sep 2023 19:14:45 +0530
Subject: [PATCH 04/27] edited signal name

---
 funnel/signals.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/funnel/signals.py b/funnel/signals.py
index 4fa1fbb42..b2889e267 100644
--- a/funnel/signals.py
+++ b/funnel/signals.py
@@ -55,11 +55,10 @@
 user_data_changed = app_signals.signal('user-data-changed')
 org_data_changed = app_signals.signal('org-data-changed')
 team_data_changed = app_signals.signal('team-data-changed')
-project_data_changed = app_signals.signal('project_data_changed')
 session_revoked = app_signals.signal('session-revoked')
 
 # Commentset role change signals (sends user, document)
 project_role_change = app_signals.signal('project_role_change')
 proposal_role_change = app_signals.signal('proposal_role_change')
 
-# Project data change signal
+project_data_change = app_signals.signal('project_data_change')

From 99bfe3726405ff2eb8d5ae9fa467a4bfae081814 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 28 Sep 2023 13:50:28 +0000
Subject: [PATCH 05/27] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 funnel/views/project.py                       |   2 +-
 funnel/views/thumnbnails.py                   |   9 +-
 ...dded_thumbnail_image_column_to_project_.py | 279 +++++++++++-------
 3 files changed, 174 insertions(+), 116 deletions(-)

diff --git a/funnel/views/project.py b/funnel/views/project.py
index 8e37541b3..7105ed4ee 100644
--- a/funnel/views/project.py
+++ b/funnel/views/project.py
@@ -48,7 +48,7 @@
     db,
     sa,
 )
-from ..signals import project_data_change, project_role_change
+from ..signals import project_role_change
 from ..typing import ReturnRenderWith, ReturnView
 from .helpers import html_in_json, render_redirect
 from .jobs import import_tickets, tag_locations
diff --git a/funnel/views/thumnbnails.py b/funnel/views/thumnbnails.py
index 365338137..0fe8cdbda 100644
--- a/funnel/views/thumnbnails.py
+++ b/funnel/views/thumnbnails.py
@@ -2,11 +2,8 @@
 
 from flask import render_template
 from html2image import Html2Image
-from ..models import Project, db
-from .jobs import rqjob
-from ..signals import project_data_changed
 
-from ..models import Project
+from ..models import Project, db
 from ..signals import project_data_change
 from .jobs import rqjob
 
@@ -24,7 +21,9 @@ def render_thumbnail_image(project=Project) -> None:
 
     image_html = render_template('thumbnail_preview.html.jinja2', project=project)
 
-    thumbnail_image = thumbnail.screenshot(html_str=image_html, save_as=f'{project.id}_thumbnail.png', size=(640, 360))
+    thumbnail_image = thumbnail.screenshot(
+        html_str=image_html, save_as=f'{project.id}_thumbnail.png', size=(640, 360)
+    )
 
     project.thumbnail_image = thumbnail_image
     db.session.add(project)
diff --git a/migrations/versions/8750fd8f82de_added_thumbnail_image_column_to_project_.py b/migrations/versions/8750fd8f82de_added_thumbnail_image_column_to_project_.py
index e88b831cb..cdcd7e666 100644
--- a/migrations/versions/8750fd8f82de_added_thumbnail_image_column_to_project_.py
+++ b/migrations/versions/8750fd8f82de_added_thumbnail_image_column_to_project_.py
@@ -6,17 +6,16 @@
 
 """
 
-from typing import Optional, Tuple, Union
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision: str = '8750fd8f82de'
 down_revision: str = '4f9ca10b7b9d'
-branch_labels: Optional[Union[str, Tuple[str, ...]]] = None
-depends_on: Optional[Union[str, Tuple[str, ...]]] = None
+branch_labels: str | tuple[str, ...] | None = None
+depends_on: str | tuple[str, ...] | None = None
 
 
 def upgrade(engine_name: str = '') -> None:
@@ -31,14 +30,13 @@ def downgrade(engine_name: str = '') -> None:
     globals().get(f'downgrade_{engine_name}', lambda: None)()
 
 
-
-
-
 def upgrade_() -> None:
     """Upgrade default database."""
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('project', schema=None) as batch_op:
-        batch_op.add_column(sa.Column('thumbnail_image', sa.LargeBinary(), nullable=True))
+        batch_op.add_column(
+            sa.Column('thumbnail_image', sa.LargeBinary(), nullable=True)
+        )
 
     # ### end Alembic commands ###
 
@@ -55,111 +53,162 @@ def downgrade_() -> None:
 def upgrade_geoname() -> None:
     """Upgrade geoname database."""
     # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('geo_country_info',
-    sa.Column('iso_alpha2', sa.CHAR(length=2), nullable=True),
-    sa.Column('iso_alpha3', sa.CHAR(length=3), nullable=True),
-    sa.Column('iso_numeric', sa.Integer(), nullable=True),
-    sa.Column('fips_code', sa.Unicode(length=3), nullable=True),
-    sa.Column('capital', sa.String(), nullable=True),
-    sa.Column('area_in_sqkm', sa.Numeric(), nullable=True),
-    sa.Column('population', sa.BigInteger(), nullable=True),
-    sa.Column('continent', sa.CHAR(length=2), nullable=True),
-    sa.Column('tld', sa.Unicode(length=3), nullable=True),
-    sa.Column('currency_code', sa.CHAR(length=3), nullable=True),
-    sa.Column('currency_name', sa.String(), nullable=True),
-    sa.Column('phone', sa.Unicode(length=16), nullable=True),
-    sa.Column('postal_code_format', sa.Unicode(), nullable=True),
-    sa.Column('postal_code_regex', sa.Unicode(), nullable=True),
-    sa.Column('languages', postgresql.ARRAY(sa.Unicode(), dimensions=1), nullable=True),
-    sa.Column('neighbours', postgresql.ARRAY(sa.CHAR(length=2), dimensions=1), nullable=True),
-    sa.Column('equivalent_fips_code', sa.Unicode(length=3), nullable=False),
-    sa.Column('name', sa.Unicode(length=250), nullable=False),
-    sa.Column('title', sa.Unicode(length=250), nullable=False),
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
-    sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('iso_alpha2'),
-    sa.UniqueConstraint('iso_alpha3'),
-    sa.UniqueConstraint('name')
+    op.create_table(
+        'geo_country_info',
+        sa.Column('iso_alpha2', sa.CHAR(length=2), nullable=True),
+        sa.Column('iso_alpha3', sa.CHAR(length=3), nullable=True),
+        sa.Column('iso_numeric', sa.Integer(), nullable=True),
+        sa.Column('fips_code', sa.Unicode(length=3), nullable=True),
+        sa.Column('capital', sa.String(), nullable=True),
+        sa.Column('area_in_sqkm', sa.Numeric(), nullable=True),
+        sa.Column('population', sa.BigInteger(), nullable=True),
+        sa.Column('continent', sa.CHAR(length=2), nullable=True),
+        sa.Column('tld', sa.Unicode(length=3), nullable=True),
+        sa.Column('currency_code', sa.CHAR(length=3), nullable=True),
+        sa.Column('currency_name', sa.String(), nullable=True),
+        sa.Column('phone', sa.Unicode(length=16), nullable=True),
+        sa.Column('postal_code_format', sa.Unicode(), nullable=True),
+        sa.Column('postal_code_regex', sa.Unicode(), nullable=True),
+        sa.Column(
+            'languages', postgresql.ARRAY(sa.Unicode(), dimensions=1), nullable=True
+        ),
+        sa.Column(
+            'neighbours',
+            postgresql.ARRAY(sa.CHAR(length=2), dimensions=1),
+            nullable=True,
+        ),
+        sa.Column('equivalent_fips_code', sa.Unicode(length=3), nullable=False),
+        sa.Column('name', sa.Unicode(length=250), nullable=False),
+        sa.Column('title', sa.Unicode(length=250), nullable=False),
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
+        sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
+        sa.PrimaryKeyConstraint('id'),
+        sa.UniqueConstraint('iso_alpha2'),
+        sa.UniqueConstraint('iso_alpha3'),
+        sa.UniqueConstraint('name'),
     )
     with op.batch_alter_table('geo_country_info', schema=None) as batch_op:
-        batch_op.create_index('ix_geo_country_info_title', [sa.text("lower('title')")], unique=False, postgresql_ops={'title_lower': 'varchar_pattern_ops'})
-
-    op.create_table('geo_admin1_code',
-    sa.Column('title', sa.Unicode(), nullable=True),
-    sa.Column('ascii_title', sa.Unicode(), nullable=True),
-    sa.Column('country', sa.CHAR(length=2), nullable=True),
-    sa.Column('admin1_code', sa.Unicode(), nullable=True),
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
-    sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
-    sa.ForeignKeyConstraint(['country'], ['geo_country_info.iso_alpha2'], ),
-    sa.PrimaryKeyConstraint('id')
+        batch_op.create_index(
+            'ix_geo_country_info_title',
+            [sa.text("lower('title')")],
+            unique=False,
+            postgresql_ops={'title_lower': 'varchar_pattern_ops'},
+        )
+
+    op.create_table(
+        'geo_admin1_code',
+        sa.Column('title', sa.Unicode(), nullable=True),
+        sa.Column('ascii_title', sa.Unicode(), nullable=True),
+        sa.Column('country', sa.CHAR(length=2), nullable=True),
+        sa.Column('admin1_code', sa.Unicode(), nullable=True),
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
+        sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
+        sa.ForeignKeyConstraint(
+            ['country'],
+            ['geo_country_info.iso_alpha2'],
+        ),
+        sa.PrimaryKeyConstraint('id'),
     )
-    op.create_table('geo_admin2_code',
-    sa.Column('title', sa.Unicode(), nullable=True),
-    sa.Column('ascii_title', sa.Unicode(), nullable=True),
-    sa.Column('country', sa.CHAR(length=2), nullable=True),
-    sa.Column('admin1_code', sa.Unicode(), nullable=True),
-    sa.Column('admin2_code', sa.Unicode(), nullable=True),
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
-    sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
-    sa.ForeignKeyConstraint(['country'], ['geo_country_info.iso_alpha2'], ),
-    sa.PrimaryKeyConstraint('id')
+    op.create_table(
+        'geo_admin2_code',
+        sa.Column('title', sa.Unicode(), nullable=True),
+        sa.Column('ascii_title', sa.Unicode(), nullable=True),
+        sa.Column('country', sa.CHAR(length=2), nullable=True),
+        sa.Column('admin1_code', sa.Unicode(), nullable=True),
+        sa.Column('admin2_code', sa.Unicode(), nullable=True),
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
+        sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
+        sa.ForeignKeyConstraint(
+            ['country'],
+            ['geo_country_info.iso_alpha2'],
+        ),
+        sa.PrimaryKeyConstraint('id'),
     )
-    op.create_table('geo_name',
-    sa.Column('ascii_title', sa.Unicode(), nullable=True),
-    sa.Column('latitude', sa.Numeric(), nullable=True),
-    sa.Column('longitude', sa.Numeric(), nullable=True),
-    sa.Column('fclass', sa.CHAR(length=1), nullable=True),
-    sa.Column('fcode', sa.Unicode(), nullable=True),
-    sa.Column('country', sa.CHAR(length=2), nullable=True),
-    sa.Column('cc2', sa.Unicode(), nullable=True),
-    sa.Column('admin1', sa.Unicode(), nullable=True),
-    sa.Column('admin1_id', sa.Integer(), nullable=True),
-    sa.Column('admin2', sa.Unicode(), nullable=True),
-    sa.Column('admin2_id', sa.Integer(), nullable=True),
-    sa.Column('admin4', sa.Unicode(), nullable=True),
-    sa.Column('admin3', sa.Unicode(), nullable=True),
-    sa.Column('population', sa.BigInteger(), nullable=True),
-    sa.Column('elevation', sa.Integer(), nullable=True),
-    sa.Column('dem', sa.Integer(), nullable=True),
-    sa.Column('timezone', sa.Unicode(), nullable=True),
-    sa.Column('moddate', sa.Date(), nullable=True),
-    sa.Column('name', sa.Unicode(length=250), nullable=False),
-    sa.Column('title', sa.Unicode(length=250), nullable=False),
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
-    sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
-    sa.ForeignKeyConstraint(['admin1_id'], ['geo_admin1_code.id'], ),
-    sa.ForeignKeyConstraint(['admin2_id'], ['geo_admin2_code.id'], ),
-    sa.ForeignKeyConstraint(['country'], ['geo_country_info.iso_alpha2'], ),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('name')
+    op.create_table(
+        'geo_name',
+        sa.Column('ascii_title', sa.Unicode(), nullable=True),
+        sa.Column('latitude', sa.Numeric(), nullable=True),
+        sa.Column('longitude', sa.Numeric(), nullable=True),
+        sa.Column('fclass', sa.CHAR(length=1), nullable=True),
+        sa.Column('fcode', sa.Unicode(), nullable=True),
+        sa.Column('country', sa.CHAR(length=2), nullable=True),
+        sa.Column('cc2', sa.Unicode(), nullable=True),
+        sa.Column('admin1', sa.Unicode(), nullable=True),
+        sa.Column('admin1_id', sa.Integer(), nullable=True),
+        sa.Column('admin2', sa.Unicode(), nullable=True),
+        sa.Column('admin2_id', sa.Integer(), nullable=True),
+        sa.Column('admin4', sa.Unicode(), nullable=True),
+        sa.Column('admin3', sa.Unicode(), nullable=True),
+        sa.Column('population', sa.BigInteger(), nullable=True),
+        sa.Column('elevation', sa.Integer(), nullable=True),
+        sa.Column('dem', sa.Integer(), nullable=True),
+        sa.Column('timezone', sa.Unicode(), nullable=True),
+        sa.Column('moddate', sa.Date(), nullable=True),
+        sa.Column('name', sa.Unicode(length=250), nullable=False),
+        sa.Column('title', sa.Unicode(length=250), nullable=False),
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
+        sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
+        sa.ForeignKeyConstraint(
+            ['admin1_id'],
+            ['geo_admin1_code.id'],
+        ),
+        sa.ForeignKeyConstraint(
+            ['admin2_id'],
+            ['geo_admin2_code.id'],
+        ),
+        sa.ForeignKeyConstraint(
+            ['country'],
+            ['geo_country_info.iso_alpha2'],
+        ),
+        sa.PrimaryKeyConstraint('id'),
+        sa.UniqueConstraint('name'),
     )
     with op.batch_alter_table('geo_name', schema=None) as batch_op:
-        batch_op.create_index('ix_geo_name_ascii_title', [sa.text('lower(ascii_title)')], unique=False, postgresql_ops={'ascii_title_lower': 'varchar_pattern_ops'})
-        batch_op.create_index('ix_geo_name_title', [sa.text("lower('title')")], unique=False, postgresql_ops={'title_lower': 'varchar_pattern_ops'})
-
-    op.create_table('geo_alt_name',
-    sa.Column('geonameid', sa.Integer(), nullable=False),
-    sa.Column('lang', sa.Unicode(), nullable=True),
-    sa.Column('title', sa.Unicode(), nullable=False),
-    sa.Column('is_preferred_name', sa.Boolean(), nullable=False),
-    sa.Column('is_short_name', sa.Boolean(), nullable=False),
-    sa.Column('is_colloquial', sa.Boolean(), nullable=False),
-    sa.Column('is_historic', sa.Boolean(), nullable=False),
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
-    sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
-    sa.ForeignKeyConstraint(['geonameid'], ['geo_name.id'], ),
-    sa.PrimaryKeyConstraint('id')
+        batch_op.create_index(
+            'ix_geo_name_ascii_title',
+            [sa.text('lower(ascii_title)')],
+            unique=False,
+            postgresql_ops={'ascii_title_lower': 'varchar_pattern_ops'},
+        )
+        batch_op.create_index(
+            'ix_geo_name_title',
+            [sa.text("lower('title')")],
+            unique=False,
+            postgresql_ops={'title_lower': 'varchar_pattern_ops'},
+        )
+
+    op.create_table(
+        'geo_alt_name',
+        sa.Column('geonameid', sa.Integer(), nullable=False),
+        sa.Column('lang', sa.Unicode(), nullable=True),
+        sa.Column('title', sa.Unicode(), nullable=False),
+        sa.Column('is_preferred_name', sa.Boolean(), nullable=False),
+        sa.Column('is_short_name', sa.Boolean(), nullable=False),
+        sa.Column('is_colloquial', sa.Boolean(), nullable=False),
+        sa.Column('is_historic', sa.Boolean(), nullable=False),
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
+        sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
+        sa.ForeignKeyConstraint(
+            ['geonameid'],
+            ['geo_name.id'],
+        ),
+        sa.PrimaryKeyConstraint('id'),
     )
     with op.batch_alter_table('geo_alt_name', schema=None) as batch_op:
-        batch_op.create_index(batch_op.f('ix_geo_alt_name_lang'), ['lang'], unique=False)
-        batch_op.create_index('ix_geo_alt_name_title', [sa.text("lower('title')")], unique=False, postgresql_ops={'title_lower': 'varchar_pattern_ops'})
+        batch_op.create_index(
+            batch_op.f('ix_geo_alt_name_lang'), ['lang'], unique=False
+        )
+        batch_op.create_index(
+            'ix_geo_alt_name_title',
+            [sa.text("lower('title')")],
+            unique=False,
+            postgresql_ops={'title_lower': 'varchar_pattern_ops'},
+        )
 
     # ### end Alembic commands ###
 
@@ -168,20 +217,30 @@ def downgrade_geoname() -> None:
     """Downgrade geoname database."""
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('geo_alt_name', schema=None) as batch_op:
-        batch_op.drop_index('ix_geo_alt_name_title', postgresql_ops={'title_lower': 'varchar_pattern_ops'})
+        batch_op.drop_index(
+            'ix_geo_alt_name_title',
+            postgresql_ops={'title_lower': 'varchar_pattern_ops'},
+        )
         batch_op.drop_index(batch_op.f('ix_geo_alt_name_lang'))
 
     op.drop_table('geo_alt_name')
     with op.batch_alter_table('geo_name', schema=None) as batch_op:
-        batch_op.drop_index('ix_geo_name_title', postgresql_ops={'title_lower': 'varchar_pattern_ops'})
-        batch_op.drop_index('ix_geo_name_ascii_title', postgresql_ops={'ascii_title_lower': 'varchar_pattern_ops'})
+        batch_op.drop_index(
+            'ix_geo_name_title', postgresql_ops={'title_lower': 'varchar_pattern_ops'}
+        )
+        batch_op.drop_index(
+            'ix_geo_name_ascii_title',
+            postgresql_ops={'ascii_title_lower': 'varchar_pattern_ops'},
+        )
 
     op.drop_table('geo_name')
     op.drop_table('geo_admin2_code')
     op.drop_table('geo_admin1_code')
     with op.batch_alter_table('geo_country_info', schema=None) as batch_op:
-        batch_op.drop_index('ix_geo_country_info_title', postgresql_ops={'title_lower': 'varchar_pattern_ops'})
+        batch_op.drop_index(
+            'ix_geo_country_info_title',
+            postgresql_ops={'title_lower': 'varchar_pattern_ops'},
+        )
 
     op.drop_table('geo_country_info')
     # ### end Alembic commands ###
-

From 43a6f8029292153dbb037d0e0d776f13c43da524 Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Thu, 28 Sep 2023 20:42:57 +0530
Subject: [PATCH 06/27] Fixed autocorrections in precommit

Configured precommit to run locally
---
 funnel/views/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/funnel/views/project.py b/funnel/views/project.py
index 7105ed4ee..363e5852e 100644
--- a/funnel/views/project.py
+++ b/funnel/views/project.py
@@ -48,7 +48,7 @@
     db,
     sa,
 )
-from ..signals import project_role_change
+from ..signals import project_role_change, project_data_change
 from ..typing import ReturnRenderWith, ReturnView
 from .helpers import html_in_json, render_redirect
 from .jobs import import_tickets, tag_locations

From 7b2c6fd591746b6a0bc2eb099d71692e030b61a1 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 28 Sep 2023 15:15:11 +0000
Subject: [PATCH 07/27] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 funnel/views/project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/funnel/views/project.py b/funnel/views/project.py
index 363e5852e..7105ed4ee 100644
--- a/funnel/views/project.py
+++ b/funnel/views/project.py
@@ -48,7 +48,7 @@
     db,
     sa,
 )
-from ..signals import project_role_change, project_data_change
+from ..signals import project_role_change
 from ..typing import ReturnRenderWith, ReturnView
 from .helpers import html_in_json, render_redirect
 from .jobs import import_tickets, tag_locations

From e62116535cf82c7279f2bcd8952e99dbd6a0ef24 Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Thu, 28 Sep 2023 20:42:57 +0530
Subject: [PATCH 08/27] Added cache-control headers to the response object

---
 funnel/views/project.py     |  6 +++---
 funnel/views/thumnbnails.py | 13 ++++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/funnel/views/project.py b/funnel/views/project.py
index 7105ed4ee..ecc653d46 100644
--- a/funnel/views/project.py
+++ b/funnel/views/project.py
@@ -48,7 +48,7 @@
     db,
     sa,
 )
-from ..signals import project_role_change
+from ..signals import project_data_change, project_role_change
 from ..typing import ReturnRenderWith, ReturnView
 from .helpers import html_in_json, render_redirect
 from .jobs import import_tickets, tag_locations
@@ -283,7 +283,7 @@ def new_project(self) -> ReturnView:
 
             flash(_("Your new project has been created"), 'info')
 
-            project_data_changed.send(self.obj, changes=['new'])
+            project_data_change.send(self.obj, changes=['new'])
 
             # tag locations
             tag_locations.queue(project.id)
@@ -457,7 +457,7 @@ def edit(self) -> ReturnView:
             db.session.commit()
             flash(_("Your changes have been saved"), 'info')
             tag_locations.queue(self.obj.id)
-            project_data_changed.send(self.obj, changes=['edit'])
+            project_data_change.send(self.obj, changes=['edit'])
 
             # Find and delete draft if it exists
             if self.get_draft() is not None:
diff --git a/funnel/views/thumnbnails.py b/funnel/views/thumnbnails.py
index 0fe8cdbda..33fcdaf38 100644
--- a/funnel/views/thumnbnails.py
+++ b/funnel/views/thumnbnails.py
@@ -1,6 +1,6 @@
-"""View for autogenerating thumbnail previews"""
+"""View for autogenerating thumbnail previews."""
 
-from flask import render_template
+from flask import Response
 from html2image import Html2Image
 
 from ..models import Project, db
@@ -16,7 +16,7 @@ def generate_thumbnail_image(project=Project) -> None:
 
 
 @rqjob()
-def render_thumbnail_image(project=Project) -> None:
+def render_thumbnail_image(project=Project) -> Response:
     """Render the thumbnail image and cache the file using a background task"""
 
     image_html = render_template('thumbnail_preview.html.jinja2', project=project)
@@ -28,3 +28,10 @@ def render_thumbnail_image(project=Project) -> None:
     project.thumbnail_image = thumbnail_image
     db.session.add(project)
     db.session.commit()
+
+    response = Response(
+        status=200,
+        headers=[('Cache-Control', 'non-cache, no-store, max-age=0, must-revalidate'),
+                 ('Pragma', 'no-cahce')],
+    )
+    return response

From ae5736e7c643844bb351724577772b869ffe4d9f Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Wed, 11 Oct 2023 18:30:40 +0530
Subject: [PATCH 09/27] Added the autogenerated thumbnail image to db along 
 with a new endpoint to serve image from project view

---
 funnel/templates/layout.html.jinja2           |   4 +-
 .../templates/thumbnail_preview.html.jinja2   | 132 +++++++++++++++---
 funnel/views/__init__.py                      |   1 +
 funnel/views/project.py                       |  25 +++-
 funnel/views/thumbnails.py                    |  50 +++++++
 funnel/views/thumnbnails.py                   |  37 -----
 6 files changed, 185 insertions(+), 64 deletions(-)
 create mode 100644 funnel/views/thumbnails.py
 delete mode 100644 funnel/views/thumnbnails.py

diff --git a/funnel/templates/layout.html.jinja2 b/funnel/templates/layout.html.jinja2
index a1d8ac9dc..30bdcf3de 100644
--- a/funnel/templates/layout.html.jinja2
+++ b/funnel/templates/layout.html.jinja2
@@ -52,8 +52,8 @@
     {%- block image_src %}
       {%- if project and project.bg_image.url %}
         <link rel="image_src" href="{{ project.bg_image }}" />
-        <meta property="og:image" content="{{ project.bg_image }}" />
-        <meta name="twitter:image" content="{{ project.bg_image }}" />
+        <meta property="og:image" content="{{ url_for('thumbnail_image') }}" />
+        <meta name="twitter:image" content="{{ url_for('thumbnail_image') }}" />
       {%- elif project and project.account.logo_url %}
         <link rel="image_src" href="{{ project.account.logo_url }}" />
         <meta property="og:image" content="{{ project.account.logo_url }}" />
diff --git a/funnel/templates/thumbnail_preview.html.jinja2 b/funnel/templates/thumbnail_preview.html.jinja2
index a58adf232..4e79ddbf1 100644
--- a/funnel/templates/thumbnail_preview.html.jinja2
+++ b/funnel/templates/thumbnail_preview.html.jinja2
@@ -1,23 +1,115 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="stylesheet" type="text/css" href="{{ manifest('css/app.css') }}" />
-    <link rel="stylesheet" type="text/css" href="{{ manifest('css/project.css') }}" />
-  </head>
-  <body>
-    <main>
-      <div class="main-wrapper">
-        <div class="title-wrapper">
-          <h5>{{project.account.title}}</h5>
-          <h1 class="post-title">{{ project.title }}</h1>
-          <div class="mui--text-heading mui--text-light zero-bottom-margin">
-            {{ project.tagline }}
-          </div>
-        </div>
-        {{ project.datelocation }} {{ project.primary_venue }}
-      </div>
-    </main>
-  </body>
+    <head>
+        <meta charset="UTF-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <style>
+            * {
+              box-sizing: border-box;
+              color: #1f2d3d;
+              font-weight: 700;
+              font-family: 'SegoeUI', 'Montserrat', 'Helvetica', sans-serif;
+              padding: 0;
+              margin: 0;
+            }
+
+            body {
+                width: 640px;
+                height: 360px
+            }
+
+            .main-wrapper {
+                width: 100%;
+                height: 100%;
+                position: relative;
+                display: flex;
+                align-items: start;
+                justify-content: space-between;
+            }
+
+            .main-content {
+              width: -webkit-fill-available;
+            }
+
+            .project-title {
+                font-size: 2.5em;
+                text-align: left;
+                padding-bottom: 1rem;
+                font-weight: 500;
+                border-bottom: 1px solid #1f2d3d;
+            }
+
+            .project-tagline {
+                padding-top: 1rem;
+                font-size: 1.5rem;
+                font-weight: 300;
+            }
+            .title-wrapper{
+                line-height: 1.2;
+                text-align: left;
+                padding: 1.5em;
+            }
+
+            .organization-label{
+              text-transform: uppercase;
+              padding-bottom: 0.5rem;
+            }
+
+
+            .datetime-wrapper {
+              position: absolute;
+              left: 1.5em;
+              bottom: 2em;
+              gap: 8em;
+              text-align: left;
+              display: flex;
+              justify-content: space-between;
+            }
+        </style>
+    </head>
+    <body>
+        <main class="main-wrapper" id="container">
+            <div class="main-content">
+                <div class="title-wrapper">
+                <h5 class="organization-label">{{project.account.title}}</h5>
+                    <h1 class="project-title">{{ project.title }}</h1>
+                    <div class="project-tagline">
+                      {{ project.tagline }}
+                    </div>
+                </div>
+                <div class="datetime-wrapper">
+                    <p>{{ project.datelocation }}</p>
+                    <p>{{ project.primary_venue }}</p>
+                </div>
+            </div>
+        </main>
+        <script>
+            const randomizeIndex = (count) => {
+                return Math.floor(count * Math.random());
+            };
+
+            const randomizeElements = (array) => {
+                const result = [];
+                const randomSelection = new Set();
+                while (result.length < 2) {
+                    const index = randomizeIndex(array.length);
+                    const element = array[index];
+                    if (randomSelection.has(element)) {
+                        continue;
+                    }
+                    randomSelection.add(element);
+                    result.push(element);
+                }
+                return result;
+            };
+
+            window.addEventListener("load", () => {
+                var hueValues = [5, 23, 39, 48, 92, 172, 201, 220, 273, 335]
+                huePair = randomizeElements(hueValues, 2);
+                var gradient = 'linear-gradient(to bottom right, hsl('+ huePair[0] +', 100%, 87%), hsl('+ (huePair[0]+(huePair[1]-huePair[0])*0.33) +', 100%, 87%), hsl('+ (huePair[0]+(huePair[1]-huePair[0])*0.66) +', 100%, 87%), hsl('+ huePair[1] +', 100%, 87%))';
+                console.log(gradient);
+                document.getElementById("container").style.background = gradient;
+            })
+        </script>
+    </body>
 </html>
diff --git a/funnel/views/__init__.py b/funnel/views/__init__.py
index f3c17cd36..764fc684c 100644
--- a/funnel/views/__init__.py
+++ b/funnel/views/__init__.py
@@ -38,6 +38,7 @@
     shortlink,
     siteadmin,
     sitemap,
+    thumbnails,
     ticket_event,
     ticket_participant,
     update,
diff --git a/funnel/views/project.py b/funnel/views/project.py
index ecc653d46..2cf6c9537 100644
--- a/funnel/views/project.py
+++ b/funnel/views/project.py
@@ -6,9 +6,10 @@
 from json import JSONDecodeError
 from types import SimpleNamespace
 
-from flask import Response, abort, current_app, flash, render_template, request
+from flask import Response, abort, current_app, flash, render_template, request, send_file
 from flask_babel import format_number
 from markupsafe import Markup
+from PIL import Image
 
 from baseframe import _, __, forms
 from baseframe.forms import render_delete_sqla, render_form, render_message
@@ -49,7 +50,7 @@
     sa,
 )
 from ..signals import project_data_change, project_role_change
-from ..typing import ReturnRenderWith, ReturnView
+from ..typing import ReturnRenderWith, ReturnView, IO
 from .helpers import html_in_json, render_redirect
 from .jobs import import_tickets, tag_locations
 from .login_session import (
@@ -283,7 +284,7 @@ def new_project(self) -> ReturnView:
 
             flash(_("Your new project has been created"), 'info')
 
-            project_data_change.send(self.obj, changes=['new'])
+            project_data_change.send(self.obj)
 
             # tag locations
             tag_locations.queue(project.id)
@@ -457,7 +458,7 @@ def edit(self) -> ReturnView:
             db.session.commit()
             flash(_("Your changes have been saved"), 'info')
             tag_locations.queue(self.obj.id)
-            project_data_change.send(self.obj, changes=['edit'])
+            project_data_change.send(self.obj)
 
             # Find and delete draft if it exists
             if self.get_draft() is not None:
@@ -908,6 +909,20 @@ def update_featured(self) -> ReturnView:
                 'message': _("This project is no longer featured"),
             }
         return render_redirect(get_next_url(referrer=True))
-
+    @app.route('/thumbnail_image', methods=['GET'])
+    def thumbnail_image(self) -> IO | str:
+        """Return the project thumbnail image from db."""
+        if self.obj.thumbnail_image :
+            thumbnail_io = io.BytesIO(self.obj.thumbnail_image)
+            img = Image.open(thumbnail_io)
+            img.save(thumbnail_io, format='PNG')
+            thumbnail_io.seek(0)
+            return send_file(
+                thumbnail_io,
+                as_attachment=False,
+                mimetype='image/png'
+            )
+        else:
+            return self.obj.bg_image
 
 ProjectView.init_app(app)
diff --git a/funnel/views/thumbnails.py b/funnel/views/thumbnails.py
new file mode 100644
index 000000000..f6eaffc02
--- /dev/null
+++ b/funnel/views/thumbnails.py
@@ -0,0 +1,50 @@
+"""View for autogenerating thumbnail previews."""
+
+from __future__ import annotations
+
+import tempfile
+import os
+
+from flask import Response, render_template
+from html2image import Html2Image
+
+from ..models import Project, db
+from ..signals import project_data_change
+from .jobs import rqjob
+
+@project_data_change.connect
+def generate_thumbnail_image(project: Project) -> None:
+    render_thumbnail_image.queue(project=project)
+
+
+@rqjob()
+def render_thumbnail_image(project: Project) -> Response:
+    """Render the thumbnail image and cache the file using a background task"""
+
+    thumbnail = Html2Image(size=(640, 360))
+    image_html = render_template('thumbnail_preview.html.jinja2', project=project)
+    thumbnail_image, temp_filepath = tempfile.mkstemp()
+    os.close(thumbnail_image)
+
+    temp_dir = os.path.split(temp_filepath)
+    thumbnail.output_path = temp_dir[0]
+    thumbnail.screenshot(
+        html_str=image_html, save_as='thumbnail_image.png', size=(640, 360)
+    )
+
+    with open(os.path.join(temp_dir[0],'thumbnail_image.png'), mode='rb') as file:
+        thumbnail_data = bytearray(file.read())
+        project.thumbnail_image = thumbnail_data
+        print(thumbnail_data)
+        db.session.add(project)
+
+    db.session.commit()
+
+    response = Response(
+        status=200,
+        headers=[
+            ('Cache-Control', 'non-cache, no-store, max-age=0, must-revalidate'),
+            ('Pragma', 'no-cahce'),
+        ],
+    )
+    return response
diff --git a/funnel/views/thumnbnails.py b/funnel/views/thumnbnails.py
deleted file mode 100644
index 33fcdaf38..000000000
--- a/funnel/views/thumnbnails.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""View for autogenerating thumbnail previews."""
-
-from flask import Response
-from html2image import Html2Image
-
-from ..models import Project, db
-from ..signals import project_data_change
-from .jobs import rqjob
-
-thumbnail = Html2Image(size=(640, 360))
-
-
-@project_data_change.connect
-def generate_thumbnail_image(project=Project) -> None:
-    render_thumbnail_image(project=project)
-
-
-@rqjob()
-def render_thumbnail_image(project=Project) -> Response:
-    """Render the thumbnail image and cache the file using a background task"""
-
-    image_html = render_template('thumbnail_preview.html.jinja2', project=project)
-
-    thumbnail_image = thumbnail.screenshot(
-        html_str=image_html, save_as=f'{project.id}_thumbnail.png', size=(640, 360)
-    )
-
-    project.thumbnail_image = thumbnail_image
-    db.session.add(project)
-    db.session.commit()
-
-    response = Response(
-        status=200,
-        headers=[('Cache-Control', 'non-cache, no-store, max-age=0, must-revalidate'),
-                 ('Pragma', 'no-cahce')],
-    )
-    return response

From 1ef3bf3ac49fcd4effc8f1c00218c7d41b566c61 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 11 Oct 2023 13:08:16 +0000
Subject: [PATCH 10/27] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 funnel/views/project.py    | 22 ++++++++++++++--------
 funnel/views/thumbnails.py |  5 +++--
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/funnel/views/project.py b/funnel/views/project.py
index 2cf6c9537..45931332b 100644
--- a/funnel/views/project.py
+++ b/funnel/views/project.py
@@ -6,7 +6,15 @@
 from json import JSONDecodeError
 from types import SimpleNamespace
 
-from flask import Response, abort, current_app, flash, render_template, request, send_file
+from flask import (
+    Response,
+    abort,
+    current_app,
+    flash,
+    render_template,
+    request,
+    send_file,
+)
 from flask_babel import format_number
 from markupsafe import Markup
 from PIL import Image
@@ -50,7 +58,7 @@
     sa,
 )
 from ..signals import project_data_change, project_role_change
-from ..typing import ReturnRenderWith, ReturnView, IO
+from ..typing import IO, ReturnRenderWith, ReturnView
 from .helpers import html_in_json, render_redirect
 from .jobs import import_tickets, tag_locations
 from .login_session import (
@@ -909,20 +917,18 @@ def update_featured(self) -> ReturnView:
                 'message': _("This project is no longer featured"),
             }
         return render_redirect(get_next_url(referrer=True))
+
     @app.route('/thumbnail_image', methods=['GET'])
     def thumbnail_image(self) -> IO | str:
         """Return the project thumbnail image from db."""
-        if self.obj.thumbnail_image :
+        if self.obj.thumbnail_image:
             thumbnail_io = io.BytesIO(self.obj.thumbnail_image)
             img = Image.open(thumbnail_io)
             img.save(thumbnail_io, format='PNG')
             thumbnail_io.seek(0)
-            return send_file(
-                thumbnail_io,
-                as_attachment=False,
-                mimetype='image/png'
-            )
+            return send_file(thumbnail_io, as_attachment=False, mimetype='image/png')
         else:
             return self.obj.bg_image
 
+
 ProjectView.init_app(app)
diff --git a/funnel/views/thumbnails.py b/funnel/views/thumbnails.py
index f6eaffc02..a040b31db 100644
--- a/funnel/views/thumbnails.py
+++ b/funnel/views/thumbnails.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-import tempfile
 import os
+import tempfile
 
 from flask import Response, render_template
 from html2image import Html2Image
@@ -12,6 +12,7 @@
 from ..signals import project_data_change
 from .jobs import rqjob
 
+
 @project_data_change.connect
 def generate_thumbnail_image(project: Project) -> None:
     render_thumbnail_image.queue(project=project)
@@ -32,7 +33,7 @@ def render_thumbnail_image(project: Project) -> Response:
         html_str=image_html, save_as='thumbnail_image.png', size=(640, 360)
     )
 
-    with open(os.path.join(temp_dir[0],'thumbnail_image.png'), mode='rb') as file:
+    with open(os.path.join(temp_dir[0], 'thumbnail_image.png'), mode='rb') as file:
         thumbnail_data = bytearray(file.read())
         project.thumbnail_image = thumbnail_data
         print(thumbnail_data)

From 487c099e066dd256bec14bc3b5aac1183cbc9a82 Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Fri, 3 Nov 2023 18:52:37 +0530
Subject: [PATCH 11/27] Save preview image and render it with its own URL

---
 funnel/templates/layout.html.jinja2           |   8 +-
 .../project.html.jinja2}                      |   2 +-
 funnel/views/project.py                       |   2 +-
 funnel/views/thumbnails.py                    |  52 ++-
 ...dded_thumbnail_image_column_to_project_.py | 246 ---------------
 requirements.txt                              | 296 ------------------
 requirements/base.in                          |   1 +
 requirements/base.txt                         |   7 +-
 8 files changed, 35 insertions(+), 579 deletions(-)
 rename funnel/templates/{thumbnail_preview.html.jinja2 => preview/project.html.jinja2} (98%)
 delete mode 100644 migrations/versions/8750fd8f82de_added_thumbnail_image_column_to_project_.py
 delete mode 100644 requirements.txt

diff --git a/funnel/templates/layout.html.jinja2 b/funnel/templates/layout.html.jinja2
index 30bdcf3de..1f0a3dd89 100644
--- a/funnel/templates/layout.html.jinja2
+++ b/funnel/templates/layout.html.jinja2
@@ -50,10 +50,10 @@
       <meta property="og:url" content="{{ request.base_url }}" />
     {%- endblock canonical_url %}
     {%- block image_src %}
-      {%- if project and project.bg_image.url %}
-        <link rel="image_src" href="{{ project.bg_image }}" />
-        <meta property="og:image" content="{{ url_for('thumbnail_image') }}" />
-        <meta name="twitter:image" content="{{ url_for('thumbnail_image') }}" />
+      {%- if project and project.preview_image %}
+        <link rel="image_src" href="{{ project.url_for('preview_image') }}" />
+        <meta property="og:image" content="{{ project.url_for('preview_image') }}" />
+        <meta name="twitter:image" content="{{ project.url_for('preview_image') }}" />
       {%- elif project and project.account.logo_url %}
         <link rel="image_src" href="{{ project.account.logo_url }}" />
         <meta property="og:image" content="{{ project.account.logo_url }}" />
diff --git a/funnel/templates/thumbnail_preview.html.jinja2 b/funnel/templates/preview/project.html.jinja2
similarity index 98%
rename from funnel/templates/thumbnail_preview.html.jinja2
rename to funnel/templates/preview/project.html.jinja2
index 4e79ddbf1..3cb86447e 100644
--- a/funnel/templates/thumbnail_preview.html.jinja2
+++ b/funnel/templates/preview/project.html.jinja2
@@ -79,7 +79,7 @@
                 </div>
                 <div class="datetime-wrapper">
                     <p>{{ project.datelocation }}</p>
-                    <p>{{ project.primary_venue }}</p>
+                    <p>{{ project.primary_venue.title }}</p>
                 </div>
             </div>
         </main>
diff --git a/funnel/views/project.py b/funnel/views/project.py
index 0b3a60e1d..089bd28e6 100644
--- a/funnel/views/project.py
+++ b/funnel/views/project.py
@@ -917,7 +917,7 @@ def update_featured(self) -> ReturnView:
             }
         return render_redirect(get_next_url(referrer=True))
 
-    @route('preview.img')
+    @route('preview.png')
     def preview_image(self) -> Response:  # pylint: disable=R1710
         """Return the project preview image."""
         if self.obj.preview_image:
diff --git a/funnel/views/thumbnails.py b/funnel/views/thumbnails.py
index a040b31db..9b08f1ff3 100644
--- a/funnel/views/thumbnails.py
+++ b/funnel/views/thumbnails.py
@@ -5,7 +5,7 @@
 import os
 import tempfile
 
-from flask import Response, render_template
+from flask import render_template
 from html2image import Html2Image
 
 from ..models import Project, db
@@ -14,38 +14,30 @@
 
 
 @project_data_change.connect
-def generate_thumbnail_image(project: Project) -> None:
-    render_thumbnail_image.queue(project=project)
+def redo_project_preview_image(project: Project) -> None:
+    render_project_preview_image.queue(project_id=project.id)
 
 
 @rqjob()
-def render_thumbnail_image(project: Project) -> Response:
-    """Render the thumbnail image and cache the file using a background task"""
-
-    thumbnail = Html2Image(size=(640, 360))
-    image_html = render_template('thumbnail_preview.html.jinja2', project=project)
-    thumbnail_image, temp_filepath = tempfile.mkstemp()
-    os.close(thumbnail_image)
-
-    temp_dir = os.path.split(temp_filepath)
-    thumbnail.output_path = temp_dir[0]
-    thumbnail.screenshot(
-        html_str=image_html, save_as='thumbnail_image.png', size=(640, 360)
+def render_project_preview_image(project_id: int) -> None:
+    """Generate a project preview image."""
+    project = Project.query.get(project_id)
+    if project is None:
+        return
+
+    fd, temp_filepath = tempfile.mkstemp('.png')
+    os.close(fd)
+    temp_dir, temp_filename = os.path.split(temp_filepath)
+    renderer = Html2Image(size=(640, 360), output_path=temp_dir)
+    html_src = render_template('preview/project.html.jinja2', project=project)
+    screenshot_files = renderer.screenshot(
+        html_str=html_src, save_as=temp_filename, size=(640, 360)
     )
 
-    with open(os.path.join(temp_dir[0], 'thumbnail_image.png'), mode='rb') as file:
-        thumbnail_data = bytearray(file.read())
-        project.thumbnail_image = thumbnail_data
-        print(thumbnail_data)
-        db.session.add(project)
+    if screenshot_files:
+        with open(screenshot_files[0], mode='rb') as file:
+            project.preview_image = file.read()
+        db.session.commit()
 
-    db.session.commit()
-
-    response = Response(
-        status=200,
-        headers=[
-            ('Cache-Control', 'non-cache, no-store, max-age=0, must-revalidate'),
-            ('Pragma', 'no-cahce'),
-        ],
-    )
-    return response
+    for each_screenshot in screenshot_files:
+        os.remove(each_screenshot)
diff --git a/migrations/versions/8750fd8f82de_added_thumbnail_image_column_to_project_.py b/migrations/versions/8750fd8f82de_added_thumbnail_image_column_to_project_.py
deleted file mode 100644
index cdcd7e666..000000000
--- a/migrations/versions/8750fd8f82de_added_thumbnail_image_column_to_project_.py
+++ /dev/null
@@ -1,246 +0,0 @@
-"""Added thumbnail_image column to Project model
-
-Revision ID: 8750fd8f82de
-Revises: 4f9ca10b7b9d
-Create Date: 2023-09-28 18:47:07.517533
-
-"""
-
-
-import sqlalchemy as sa
-from alembic import op
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision: str = '8750fd8f82de'
-down_revision: str = '4f9ca10b7b9d'
-branch_labels: str | tuple[str, ...] | None = None
-depends_on: str | tuple[str, ...] | None = None
-
-
-def upgrade(engine_name: str = '') -> None:
-    """Upgrade all databases."""
-    # Do not modify. Edit `upgrade_` instead
-    globals().get(f'upgrade_{engine_name}', lambda: None)()
-
-
-def downgrade(engine_name: str = '') -> None:
-    """Downgrade all databases."""
-    # Do not modify. Edit `downgrade_` instead
-    globals().get(f'downgrade_{engine_name}', lambda: None)()
-
-
-def upgrade_() -> None:
-    """Upgrade default database."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table('project', schema=None) as batch_op:
-        batch_op.add_column(
-            sa.Column('thumbnail_image', sa.LargeBinary(), nullable=True)
-        )
-
-    # ### end Alembic commands ###
-
-
-def downgrade_() -> None:
-    """Downgrade default database."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table('project', schema=None) as batch_op:
-        batch_op.drop_column('thumbnail_image')
-
-    # ### end Alembic commands ###
-
-
-def upgrade_geoname() -> None:
-    """Upgrade geoname database."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table(
-        'geo_country_info',
-        sa.Column('iso_alpha2', sa.CHAR(length=2), nullable=True),
-        sa.Column('iso_alpha3', sa.CHAR(length=3), nullable=True),
-        sa.Column('iso_numeric', sa.Integer(), nullable=True),
-        sa.Column('fips_code', sa.Unicode(length=3), nullable=True),
-        sa.Column('capital', sa.String(), nullable=True),
-        sa.Column('area_in_sqkm', sa.Numeric(), nullable=True),
-        sa.Column('population', sa.BigInteger(), nullable=True),
-        sa.Column('continent', sa.CHAR(length=2), nullable=True),
-        sa.Column('tld', sa.Unicode(length=3), nullable=True),
-        sa.Column('currency_code', sa.CHAR(length=3), nullable=True),
-        sa.Column('currency_name', sa.String(), nullable=True),
-        sa.Column('phone', sa.Unicode(length=16), nullable=True),
-        sa.Column('postal_code_format', sa.Unicode(), nullable=True),
-        sa.Column('postal_code_regex', sa.Unicode(), nullable=True),
-        sa.Column(
-            'languages', postgresql.ARRAY(sa.Unicode(), dimensions=1), nullable=True
-        ),
-        sa.Column(
-            'neighbours',
-            postgresql.ARRAY(sa.CHAR(length=2), dimensions=1),
-            nullable=True,
-        ),
-        sa.Column('equivalent_fips_code', sa.Unicode(length=3), nullable=False),
-        sa.Column('name', sa.Unicode(length=250), nullable=False),
-        sa.Column('title', sa.Unicode(length=250), nullable=False),
-        sa.Column('id', sa.Integer(), nullable=False),
-        sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
-        sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
-        sa.PrimaryKeyConstraint('id'),
-        sa.UniqueConstraint('iso_alpha2'),
-        sa.UniqueConstraint('iso_alpha3'),
-        sa.UniqueConstraint('name'),
-    )
-    with op.batch_alter_table('geo_country_info', schema=None) as batch_op:
-        batch_op.create_index(
-            'ix_geo_country_info_title',
-            [sa.text("lower('title')")],
-            unique=False,
-            postgresql_ops={'title_lower': 'varchar_pattern_ops'},
-        )
-
-    op.create_table(
-        'geo_admin1_code',
-        sa.Column('title', sa.Unicode(), nullable=True),
-        sa.Column('ascii_title', sa.Unicode(), nullable=True),
-        sa.Column('country', sa.CHAR(length=2), nullable=True),
-        sa.Column('admin1_code', sa.Unicode(), nullable=True),
-        sa.Column('id', sa.Integer(), nullable=False),
-        sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
-        sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
-        sa.ForeignKeyConstraint(
-            ['country'],
-            ['geo_country_info.iso_alpha2'],
-        ),
-        sa.PrimaryKeyConstraint('id'),
-    )
-    op.create_table(
-        'geo_admin2_code',
-        sa.Column('title', sa.Unicode(), nullable=True),
-        sa.Column('ascii_title', sa.Unicode(), nullable=True),
-        sa.Column('country', sa.CHAR(length=2), nullable=True),
-        sa.Column('admin1_code', sa.Unicode(), nullable=True),
-        sa.Column('admin2_code', sa.Unicode(), nullable=True),
-        sa.Column('id', sa.Integer(), nullable=False),
-        sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
-        sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
-        sa.ForeignKeyConstraint(
-            ['country'],
-            ['geo_country_info.iso_alpha2'],
-        ),
-        sa.PrimaryKeyConstraint('id'),
-    )
-    op.create_table(
-        'geo_name',
-        sa.Column('ascii_title', sa.Unicode(), nullable=True),
-        sa.Column('latitude', sa.Numeric(), nullable=True),
-        sa.Column('longitude', sa.Numeric(), nullable=True),
-        sa.Column('fclass', sa.CHAR(length=1), nullable=True),
-        sa.Column('fcode', sa.Unicode(), nullable=True),
-        sa.Column('country', sa.CHAR(length=2), nullable=True),
-        sa.Column('cc2', sa.Unicode(), nullable=True),
-        sa.Column('admin1', sa.Unicode(), nullable=True),
-        sa.Column('admin1_id', sa.Integer(), nullable=True),
-        sa.Column('admin2', sa.Unicode(), nullable=True),
-        sa.Column('admin2_id', sa.Integer(), nullable=True),
-        sa.Column('admin4', sa.Unicode(), nullable=True),
-        sa.Column('admin3', sa.Unicode(), nullable=True),
-        sa.Column('population', sa.BigInteger(), nullable=True),
-        sa.Column('elevation', sa.Integer(), nullable=True),
-        sa.Column('dem', sa.Integer(), nullable=True),
-        sa.Column('timezone', sa.Unicode(), nullable=True),
-        sa.Column('moddate', sa.Date(), nullable=True),
-        sa.Column('name', sa.Unicode(length=250), nullable=False),
-        sa.Column('title', sa.Unicode(length=250), nullable=False),
-        sa.Column('id', sa.Integer(), nullable=False),
-        sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
-        sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
-        sa.ForeignKeyConstraint(
-            ['admin1_id'],
-            ['geo_admin1_code.id'],
-        ),
-        sa.ForeignKeyConstraint(
-            ['admin2_id'],
-            ['geo_admin2_code.id'],
-        ),
-        sa.ForeignKeyConstraint(
-            ['country'],
-            ['geo_country_info.iso_alpha2'],
-        ),
-        sa.PrimaryKeyConstraint('id'),
-        sa.UniqueConstraint('name'),
-    )
-    with op.batch_alter_table('geo_name', schema=None) as batch_op:
-        batch_op.create_index(
-            'ix_geo_name_ascii_title',
-            [sa.text('lower(ascii_title)')],
-            unique=False,
-            postgresql_ops={'ascii_title_lower': 'varchar_pattern_ops'},
-        )
-        batch_op.create_index(
-            'ix_geo_name_title',
-            [sa.text("lower('title')")],
-            unique=False,
-            postgresql_ops={'title_lower': 'varchar_pattern_ops'},
-        )
-
-    op.create_table(
-        'geo_alt_name',
-        sa.Column('geonameid', sa.Integer(), nullable=False),
-        sa.Column('lang', sa.Unicode(), nullable=True),
-        sa.Column('title', sa.Unicode(), nullable=False),
-        sa.Column('is_preferred_name', sa.Boolean(), nullable=False),
-        sa.Column('is_short_name', sa.Boolean(), nullable=False),
-        sa.Column('is_colloquial', sa.Boolean(), nullable=False),
-        sa.Column('is_historic', sa.Boolean(), nullable=False),
-        sa.Column('id', sa.Integer(), nullable=False),
-        sa.Column('created_at', sa.TIMESTAMP(timezone=True), nullable=False),
-        sa.Column('updated_at', sa.TIMESTAMP(timezone=True), nullable=False),
-        sa.ForeignKeyConstraint(
-            ['geonameid'],
-            ['geo_name.id'],
-        ),
-        sa.PrimaryKeyConstraint('id'),
-    )
-    with op.batch_alter_table('geo_alt_name', schema=None) as batch_op:
-        batch_op.create_index(
-            batch_op.f('ix_geo_alt_name_lang'), ['lang'], unique=False
-        )
-        batch_op.create_index(
-            'ix_geo_alt_name_title',
-            [sa.text("lower('title')")],
-            unique=False,
-            postgresql_ops={'title_lower': 'varchar_pattern_ops'},
-        )
-
-    # ### end Alembic commands ###
-
-
-def downgrade_geoname() -> None:
-    """Downgrade geoname database."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table('geo_alt_name', schema=None) as batch_op:
-        batch_op.drop_index(
-            'ix_geo_alt_name_title',
-            postgresql_ops={'title_lower': 'varchar_pattern_ops'},
-        )
-        batch_op.drop_index(batch_op.f('ix_geo_alt_name_lang'))
-
-    op.drop_table('geo_alt_name')
-    with op.batch_alter_table('geo_name', schema=None) as batch_op:
-        batch_op.drop_index(
-            'ix_geo_name_title', postgresql_ops={'title_lower': 'varchar_pattern_ops'}
-        )
-        batch_op.drop_index(
-            'ix_geo_name_ascii_title',
-            postgresql_ops={'ascii_title_lower': 'varchar_pattern_ops'},
-        )
-
-    op.drop_table('geo_name')
-    op.drop_table('geo_admin2_code')
-    op.drop_table('geo_admin1_code')
-    with op.batch_alter_table('geo_country_info', schema=None) as batch_op:
-        batch_op.drop_index(
-            'ix_geo_country_info_title',
-            postgresql_ops={'title_lower': 'varchar_pattern_ops'},
-        )
-
-    op.drop_table('geo_country_info')
-    # ### end Alembic commands ###
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index b7541b8ea..000000000
--- a/requirements.txt
+++ /dev/null
@@ -1,296 +0,0 @@
-aiohttp==3.8.5
-aiohttp-retry==2.8.3
-aiosignal==1.3.1
-alembic==1.12.0
-aniso8601==9.0.1
-anyio==4.0.0
-argon2-cffi==23.1.0
-argon2-cffi-bindings==21.2.0
-arrow==1.2.3
-astroid==2.15.6
-async-timeout==4.0.3
-attrs==23.1.0
-Babel==2.12.1
-bandit==1.7.5
-base58==2.1.1
--e git+https://github.com/hasgeek/baseframe.git@84d2d87ba1fdcc9945bc80ab11f43c7627a372d8#egg=baseframe
-bcrypt==4.0.1
-beautifulsoup4==4.12.2
-better-profanity==0.6.1
-black==23.7.0
-bleach==6.0.0
-blinker==1.6.2
-boto3==1.28.43
-botocore==1.31.43
-Brotli==1.1.0
-build==1.0.3
-cachelib==0.9.0
-cachetools==5.3.1
-cattrs==22.1.0
-certifi==2023.7.22
-cffi==1.15.1
-cfgv==3.4.0
-chardet==5.2.0
-charset-normalizer==3.2.0
-chevron==0.14.0
-click==8.1.7
--e git+https://github.com/hasgeek/coaster.git@d9e84f51dedb3a7863e1c3d1b0608c55c777f079#egg=coaster
-colorama==0.4.6
-coverage==6.5.0
-coveralls==3.3.1
-crontab==1.0.1
-cryptography==41.0.3
-cssbeautifier==1.14.9
-cssmin==0.2.0
-cssselect==1.2.0
-cssutils==2.7.1
-dataclasses-json==0.6.0
-dill==0.3.7
-distlib==0.3.7
-djlint==1.32.1
-dnspython==2.4.2
-docopt==0.6.2
-EditorConfig==0.12.3
-emoji==2.8.0
-exceptiongroup==1.1.3
-filelock==3.12.3
-flake8==6.1.0
-flake8-annotations==3.0.1
-flake8-assertive==2.1.0
-flake8-blind-except==0.2.1
-flake8-bugbear==23.7.10
-flake8-builtins==2.1.0
-flake8-comprehensions==3.14.0
-flake8-docstrings==1.7.0
-flake8-isort==6.0.0
-flake8-logging-format==0.9.0
-flake8-mutable==1.2.0
-flake8-plugin-utils==1.3.3
-flake8-print==5.0.0
-flake8-pytest-style==1.7.2
-Flask==2.3.3
-Flask-Admin==1.6.1
-Flask-Assets==2.0
-flask-babel==3.1.0
-Flask-Caching==2.0.2
-Flask-DebugToolbar==0.13.1
-Flask-Executor==1.0.0
-Flask-FlatPages==0.8.1
-Flask-Lastuser @ git+https://github.com/hasgeek/flask-lastuser@173a1c437068bfbec6912846390ea691801c973d
-Flask-Mail==0.9.1
-flask-mailman==0.3.0
-Flask-Migrate==4.0.4
-flask-redis==0.4.0
-Flask-RQ2==18.3
-Flask-SQLAlchemy==3.0.5
-Flask-WTF==1.1.1
-freezegun==1.2.2
-frozenlist==1.4.0
-furl==2.1.3
-future==0.18.3
-geoip2==4.7.0
-gherkin-official==24.0.0
-gitdb==4.0.10
-GitPython==3.1.35
-grapheme==0.6.0
-gunicorn==21.2.0
-h11==0.14.0
-h2==4.1.0
-hpack==4.0.0
-html-tag-names==0.1.2
-html-void-elements==0.1.0
-html2image==2.0.4.3
-html2text==2020.1.16
-html5lib==1.1
-html5print==0.1.2
-htmlmin==0.1.12
-httpcore==0.17.3
-httplib2==0.22.0
-httpx==0.24.1
-hyperframe==6.0.1
-icalendar==5.0.7
-identify==2.5.27
-idna==3.4
-ijson==3.2.3
-importlib-metadata==6.8.0
-iniconfig==2.0.0
-install==1.3.5
-isort==5.12.0
-isoweek==1.3.3
-itsdangerous==2.1.2
-Jinja2==3.1.2
-jmespath==1.0.1
-joblib==1.3.2
-jsbeautifier==1.14.9
-jsmin==3.0.1
-json5==0.9.14
-lazy-object-proxy==1.9.0
-lesscpy==0.15.1
-linkify-it-py==2.0.2
-lxml==4.9.3
-lxml-stubs==0.4.0
-Mako==1.2.4
-Markdown==3.4.4
-markdown-it-py==3.0.0
-MarkupSafe==2.1.3
-marshmallow==3.20.1
-maxminddb==2.4.0
-mccabe==0.7.0
-mdit-py-plugins==0.4.0
-mdurl==0.1.2
-mkdocs-material-extensions==1.1.1
-multidict==6.0.4
-mxsniff==0.3.5
-mypy==1.5.1
-mypy-extensions==1.0.0
-mypy-json-report==1.0.4
-nltk==3.8.1
-nodeenv==1.8.0
-oauth2==1.9.0.post1
-oauth2client==4.1.3
-oauthlib==3.2.2
-orderedmultidict==1.0.1
-outcome==1.2.0
-packaging==23.1
-parse==1.19.1
-parse-type==0.6.2
-passlib==1.7.4
-pathspec==0.11.2
-pbr==5.11.1
-pep8-naming==0.13.3
-phonenumbers==8.13.20
-pip-compile-multi==2.6.3
-pip-tools==7.3.0
-platformdirs==3.10.0
-pluggy==1.3.0
-ply==3.11
-po2json==0.2.2
-pre-commit==3.4.0
-premailer==3.10.0
-progressbar2==4.2.0
-psycopg==3.1.10
-psycopg-binary==3.1.10
-psycopg2-binary==2.9.7
-py==1.11.0
-pyasn1==0.5.0
-pyasn1-modules==0.3.0
-pycodestyle==2.11.0
-pycountry==22.3.5
-pycparser==2.21
-pydocstyle==6.3.0
-pyflakes==3.1.0
-Pygments==2.16.1
-pyIsEmail==2.0.1
-PyJWT==2.8.0
-pylint==2.17.5
-pymdown-extensions==10.3
-pyparsing==3.1.1
-pypng==0.20220715.0
-pyproject_hooks==1.0.0
-PySocks==1.7.1
-pytest==7.4.2
-pytest-asyncio==0.21.1
-pytest-base-url==2.0.0
-pytest-bdd==6.1.1
-pytest-cov==4.1.0
-pytest-dotenv==0.5.2
-pytest-env==1.0.1
-pytest-html==4.0.0
-pytest-metadata==3.0.0
-pytest-rerunfailures==12.0
-pytest-selenium==4.0.1
-pytest-socket==0.6.0
-pytest-variables==3.0.0
-python-dateutil==2.8.2
-python-dotenv==1.0.0
-python-telegram-bot==20.5
-python-utils==3.7.0
-pytz==2023.3.post1
-pyupgrade==3.10.1
-PyVimeo==1.1.0
-PyYAML==6.0.1
-qrcode==7.4.2
-rcssmin==1.1.1
-redis==5.0.0
-Redis-Sentinel-Url==1.0.1
-reformat-gherkin==3.0.1
-regex==2023.8.8
-requests==2.31.0
-requests-file==1.5.1
-requests-mock==1.11.0
-requests-oauthlib==1.3.1
-respx==0.20.2
-rich==13.5.2
-rq==1.15.1
-rq-dashboard @ git+https://github.com/jace/rq-dashboard@a3d4ba50cc796642057ed65061f646b7ca417465
-rq-scheduler==0.13.1
-rsa==4.9
-ruff==0.0.287
-s3transfer==0.6.2
-selenium==4.9.1
-semantic-version==2.10.0
-sentry-sdk==1.30.0
-six==1.16.0
-slimit==0.8.1
-smmap==5.0.0
-sniffio==1.3.0
-snowballstemmer==2.2.0
-sortedcontainers==2.4.0
-soupsieve==2.5
-SQLAlchemy==2.0.20
-sqlalchemy-json==0.7.0
-SQLAlchemy-Utils==0.41.1
-statsd==4.0.1
-stevedore==5.1.0
-sttable==0.0.1
-tenacity==8.2.3
-tinycss2==1.2.1
-tinydb==4.8.0
-tldextract==3.5.0
-tokenize-rt==5.2.0
-toml==0.10.2
-tomli==2.0.1
-tomlkit==0.12.1
-toposort==1.10
-tqdm==4.66.1
-trio==0.22.2
-trio-websocket==0.10.4
-tuspy==1.0.1
-tweepy==4.14.0
-twilio==8.8.0
-typeguard==4.1.3
-types-chevron==0.14.2.5
-types-geoip2==3.0.0
-types-ipaddress==1.0.8
-types-maxminddb==1.5.0
-types-mock==5.1.0.2
-types-pyOpenSSL==23.2.0.2
-types-python-dateutil==2.8.19.14
-types-pytz==2023.3.0.1
-types-redis==4.6.0.5
-types-requests==2.31.0.2
-types-urllib3==1.26.25.14
-typing-inspect==0.9.0
-typing_extensions==4.7.1
-ua-parser==0.18.0
-uc-micro-py==1.0.2
-Unidecode==1.3.6
-urllib3==1.26.16
-user-agents==2.2.0
-virtualenv==20.24.4
-wcwidth==0.2.6
-webassets==2.0
-webencodings==0.5.1
-websocket-client==1.6.3
-Werkzeug==2.3.7
-whitenoise==6.5.0
-wrapt==1.15.0
-wsproto==1.2.0
-WTForms==3.0.1
-WTForms-JSON==0.3.5
-WTForms-SQLAlchemy==0.3
-xxhash==3.3.0
-yarl==1.9.2
-z-base-32==0.1.2
-zipp==3.16.2
-zxcvbn==4.4.28
diff --git a/requirements/base.in b/requirements/base.in
index 3919f51d1..d36a8f379 100644
--- a/requirements/base.in
+++ b/requirements/base.in
@@ -28,6 +28,7 @@ furl
 geoip2
 grapheme
 gunicorn
+html2image
 html2text
 httpx[http2]
 icalendar
diff --git a/requirements/base.txt b/requirements/base.txt
index 6047c603d..77478745d 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,4 +1,4 @@
-# SHA1:8d570f8f7fb4bd607d33ddb31c5b62c51b09ec48
+# SHA1:ef5ad1819a228ee5ef33b14464328f1470c516e1
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -194,6 +194,8 @@ h2==4.1.0
     # via httpx
 hpack==4.0.0
     # via h2
+html2image==2.0.4.3
+    # via -r requirements/base.in
 html2text==2020.1.16
     # via -r requirements/base.in
 html5lib==1.1
@@ -389,6 +391,7 @@ requests==2.31.0
     #   -r requirements/base.in
     #   baseframe
     #   geoip2
+    #   html2image
     #   premailer
     #   pyvimeo
     #   requests-file
@@ -511,6 +514,8 @@ webencodings==0.5.1
     # via
     #   bleach
     #   html5lib
+websocket-client==1.6.4
+    # via html2image
 werkzeug==3.0.1
     # via
     #   -r requirements/base.in

From 0bdcbfb61a3d6886fd9e24663079a475da862177 Mon Sep 17 00:00:00 2001
From: Kiran Jonnalagadda <kiran@hasgeek.com>
Date: Mon, 6 Nov 2023 12:07:45 +0530
Subject: [PATCH 12/27] Call this `hti` as per example in docs

---
 funnel/views/thumbnails.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/funnel/views/thumbnails.py b/funnel/views/thumbnails.py
index 9b08f1ff3..a2ea47b99 100644
--- a/funnel/views/thumbnails.py
+++ b/funnel/views/thumbnails.py
@@ -28,11 +28,9 @@ def render_project_preview_image(project_id: int) -> None:
     fd, temp_filepath = tempfile.mkstemp('.png')
     os.close(fd)
     temp_dir, temp_filename = os.path.split(temp_filepath)
-    renderer = Html2Image(size=(640, 360), output_path=temp_dir)
+    hti = Html2Image(size=(640, 360), output_path=temp_dir)
     html_src = render_template('preview/project.html.jinja2', project=project)
-    screenshot_files = renderer.screenshot(
-        html_str=html_src, save_as=temp_filename, size=(640, 360)
-    )
+    screenshot_files = hti.screenshot(html_str=html_src, save_as=temp_filename)
 
     if screenshot_files:
         with open(screenshot_files[0], mode='rb') as file:

From 6c698d23cafcc894019b6824fcec79d52cdc584f Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Tue, 7 Nov 2023 12:07:15 +0530
Subject: [PATCH 13/27] Abort duplicate jobs in the job queue

---
 funnel/views/thumbnails.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/funnel/views/thumbnails.py b/funnel/views/thumbnails.py
index a2ea47b99..23d856440 100644
--- a/funnel/views/thumbnails.py
+++ b/funnel/views/thumbnails.py
@@ -8,6 +8,7 @@
 from flask import render_template
 from html2image import Html2Image
 
+from .. import rq
 from ..models import Project, db
 from ..signals import project_data_change
 from .jobs import rqjob
@@ -15,12 +16,18 @@
 
 @project_data_change.connect
 def redo_project_preview_image(project: Project) -> None:
-    render_project_preview_image.queue(project_id=project.id)
+    render_project_preview_image.queue(project_id=project.id, job_id=project.id)
 
 
 @rqjob()
-def render_project_preview_image(project_id: int) -> None:
+def render_project_preview_image(project_id: int, job_id: str) -> None:
     """Generate a project preview image."""
+
+    task_queue = rq.get_queue()
+    for job in task_queue.jobs:
+        if job.get_id() is job_id:
+            return
+
     project = Project.query.get(project_id)
     if project is None:
         return

From e6bcca7a207b9273c49d8d6901c207c18165ff8b Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Tue, 7 Nov 2023 18:46:12 +0530
Subject: [PATCH 14/27] Unit test for preview_image function

WIP
---
 tests/unit/views/preview_image_test.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 tests/unit/views/preview_image_test.py

diff --git a/tests/unit/views/preview_image_test.py b/tests/unit/views/preview_image_test.py
new file mode 100644
index 000000000..c7b3436ab
--- /dev/null
+++ b/tests/unit/views/preview_image_test.py
@@ -0,0 +1,16 @@
+import pytest
+
+from funnel.views.thumbnails import render_project_preview_image
+
+@pytest.mark.usefixtures('app_context')
+@pytest.fixture()
+def add_tasks_to_queue(project):
+    render_project_preview_image.queue(project_id=project.id, job_id=project.id)
+
+@pytest.mark.usefixtures('add_tasks_to_queue', 'project_expo2011', 'project_ai1',
+                         'project_ai2')
+def test_preview_image_jobs():
+    add_tasks_to_queue(project_expo2011)
+    add_tasks_to_queue(project_ai1)
+    add_tasks_to_queue(project_ai2)
+    pass

From 949a275d88ba2cd2df17c1deccd05e488e51d66f Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Tue, 7 Nov 2023 19:35:25 +0530
Subject: [PATCH 15/27] updated arguments to existing pytest fixture
 new_project

---
 tests/unit/views/preview_image_test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit/views/preview_image_test.py b/tests/unit/views/preview_image_test.py
index c7b3436ab..25786838f 100644
--- a/tests/unit/views/preview_image_test.py
+++ b/tests/unit/views/preview_image_test.py
@@ -2,10 +2,10 @@
 
 from funnel.views.thumbnails import render_project_preview_image
 
-@pytest.mark.usefixtures('app_context')
+@pytest.mark.usefixtures('app_context', 'new_project')
 @pytest.fixture()
-def add_tasks_to_queue(project):
-    render_project_preview_image.queue(project_id=project.id, job_id=project.id)
+def add_tasks_to_queue(new_project):
+    render_project_preview_image.queue(project_id=new_project.id, job_id=new_project.id)
 
 @pytest.mark.usefixtures('add_tasks_to_queue', 'project_expo2011', 'project_ai1',
                          'project_ai2')

From 52e394b21c0883aebc433e3c6e83d47183859a68 Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Wed, 8 Nov 2023 13:25:12 +0530
Subject: [PATCH 16/27] changes to the template file and tests

---
 funnel/templates/preview/project.html.jinja2 | 2 +-
 tests/unit/views/preview_image_test.py       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/funnel/templates/preview/project.html.jinja2 b/funnel/templates/preview/project.html.jinja2
index 3cb86447e..83484c318 100644
--- a/funnel/templates/preview/project.html.jinja2
+++ b/funnel/templates/preview/project.html.jinja2
@@ -105,7 +105,7 @@
 
             window.addEventListener("load", () => {
                 var hueValues = [5, 23, 39, 48, 92, 172, 201, 220, 273, 335]
-                huePair = randomizeElements(hueValues, 2);
+                huePair = randomizeElements(hueValues);
                 var gradient = 'linear-gradient(to bottom right, hsl('+ huePair[0] +', 100%, 87%), hsl('+ (huePair[0]+(huePair[1]-huePair[0])*0.33) +', 100%, 87%), hsl('+ (huePair[0]+(huePair[1]-huePair[0])*0.66) +', 100%, 87%), hsl('+ huePair[1] +', 100%, 87%))';
                 console.log(gradient);
                 document.getElementById("container").style.background = gradient;
diff --git a/tests/unit/views/preview_image_test.py b/tests/unit/views/preview_image_test.py
index 25786838f..a0b23ceea 100644
--- a/tests/unit/views/preview_image_test.py
+++ b/tests/unit/views/preview_image_test.py
@@ -5,6 +5,9 @@
 @pytest.mark.usefixtures('app_context', 'new_project')
 @pytest.fixture()
 def add_tasks_to_queue(new_project):
+    rq = RQ()
+    rq.job_class = 'rq.job.Job'
+    rq.queues = ['funnel_testing']
     render_project_preview_image.queue(project_id=new_project.id, job_id=new_project.id)
 
 @pytest.mark.usefixtures('add_tasks_to_queue', 'project_expo2011', 'project_ai1',

From 774d4995aba8ebe683d07d4071817a2253840ee7 Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Thu, 9 Nov 2023 17:43:27 +0530
Subject: [PATCH 17/27] simplified template script to generate huepairs for the
 gradient

---
 funnel/templates/preview/project.html.jinja2 | 29 +++++++++-----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/funnel/templates/preview/project.html.jinja2 b/funnel/templates/preview/project.html.jinja2
index 83484c318..89beed489 100644
--- a/funnel/templates/preview/project.html.jinja2
+++ b/funnel/templates/preview/project.html.jinja2
@@ -87,27 +87,24 @@
             const randomizeIndex = (count) => {
                 return Math.floor(count * Math.random());
             };
-
-            const randomizeElements = (array) => {
-                const result = [];
-                const randomSelection = new Set();
-                while (result.length < 2) {
-                    const index = randomizeIndex(array.length);
-                    const element = array[index];
-                    if (randomSelection.has(element)) {
-                        continue;
-                    }
-                    randomSelection.add(element);
-                    result.push(element);
+            const randomizeElements = (hueList) => {
+                const uniqueHuePair = new Set();
+                let hueCount = hueList.length;
+                let randomIndex;
+                let hue;
+                while (uniqueHuePair.size < 2) {
+                    randomIndex = randomizeIndex(hueCount);
+                    hue = hueList[randomIndex];
+                    uniqueHuePair.add(hue);
                 }
-                return result;
+                return uniqueHuePair;
             };
 
             window.addEventListener("load", () => {
                 var hueValues = [5, 23, 39, 48, 92, 172, 201, 220, 273, 335]
-                huePair = randomizeElements(hueValues);
-                var gradient = 'linear-gradient(to bottom right, hsl('+ huePair[0] +', 100%, 87%), hsl('+ (huePair[0]+(huePair[1]-huePair[0])*0.33) +', 100%, 87%), hsl('+ (huePair[0]+(huePair[1]-huePair[0])*0.66) +', 100%, 87%), hsl('+ huePair[1] +', 100%, 87%))';
-                console.log(gradient);
+                huePair = Array.from(randomizeElements(hueValues));
+                console.log(huePair);
+                var gradient = `linear-gradient(to bottom right, hsl(${huePair[0]}, 100%, 87%), hsl(${huePair[0]+(huePair[1]-huePair[0])*0.33}, 100%, 87%), hsl(${huePair[0]+(huePair[1]-huePair[0])*0.66}, 100%, 87%), hsl(${huePair[1]}, 100%, 87%))`;
                 document.getElementById("container").style.background = gradient;
             })
         </script>

From 0d613a09cf3daa3dcff43bdeba139b89817fe77b Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Thu, 9 Nov 2023 21:44:03 +0530
Subject: [PATCH 18/27] Unit test for the preview_image render function

---
 funnel/views/thumbnails.py             | 12 ++++++------
 tests/unit/views/preview_image_test.py | 18 ++++++++----------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/funnel/views/thumbnails.py b/funnel/views/thumbnails.py
index 23d856440..f9a95e363 100644
--- a/funnel/views/thumbnails.py
+++ b/funnel/views/thumbnails.py
@@ -16,17 +16,17 @@
 
 @project_data_change.connect
 def redo_project_preview_image(project: Project) -> None:
-    render_project_preview_image.queue(project_id=project.id, job_id=project.id)
+    render_project_preview_image.queue(project_id=project.id)
 
 
 @rqjob()
-def render_project_preview_image(project_id: int, job_id: str) -> None:
+def render_project_preview_image(project_id: int) -> None:
     """Generate a project preview image."""
 
-    task_queue = rq.get_queue()
-    for job in task_queue.jobs:
-        if job.get_id() is job_id:
-            return
+#     task_queue = rq.get_queue()
+#     for job in task_queue.jobs:
+#         if job.get_id() is job_id:
+#             return
 
     project = Project.query.get(project_id)
     if project is None:
diff --git a/tests/unit/views/preview_image_test.py b/tests/unit/views/preview_image_test.py
index a0b23ceea..819223f4e 100644
--- a/tests/unit/views/preview_image_test.py
+++ b/tests/unit/views/preview_image_test.py
@@ -2,18 +2,16 @@
 
 from funnel.views.thumbnails import render_project_preview_image
 
-@pytest.mark.usefixtures('app_context', 'new_project')
+@pytest.mark.usefixtures('app_context', 'project_expo2011')
 @pytest.fixture()
-def add_tasks_to_queue(new_project):
-    rq = RQ()
+def add_tasks_to_queue(project_expo2011):
+    from funnel import rq
     rq.job_class = 'rq.job.Job'
     rq.queues = ['funnel_testing']
-    render_project_preview_image.queue(project_id=new_project.id, job_id=new_project.id)
+    return render_project_preview_image.queue(project_id=project_expo2011.id)
 
 @pytest.mark.usefixtures('add_tasks_to_queue', 'project_expo2011', 'project_ai1',
-                         'project_ai2')
-def test_preview_image_jobs():
-    add_tasks_to_queue(project_expo2011)
-    add_tasks_to_queue(project_ai1)
-    add_tasks_to_queue(project_ai2)
-    pass
+                         'all_fixtures')
+def test_preview_image_jobs(project_expo2011, project_ai1):
+    assert project_expo2011.preview_image is not None
+    assert project_ai1.preview_image is None

From 81329b267ce40c76a9ad02347b5e4dbad8588334 Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Fri, 10 Nov 2023 12:40:06 +0530
Subject: [PATCH 19/27] Revised test to check database entry for preview_image
 column before/after function call

---
 funnel/views/thumbnails.py             |  6 ------
 tests/unit/views/preview_image_test.py | 16 ++++------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/funnel/views/thumbnails.py b/funnel/views/thumbnails.py
index f9a95e363..7165648ac 100644
--- a/funnel/views/thumbnails.py
+++ b/funnel/views/thumbnails.py
@@ -22,12 +22,6 @@ def redo_project_preview_image(project: Project) -> None:
 @rqjob()
 def render_project_preview_image(project_id: int) -> None:
     """Generate a project preview image."""
-
-#     task_queue = rq.get_queue()
-#     for job in task_queue.jobs:
-#         if job.get_id() is job_id:
-#             return
-
     project = Project.query.get(project_id)
     if project is None:
         return
diff --git a/tests/unit/views/preview_image_test.py b/tests/unit/views/preview_image_test.py
index 819223f4e..9ad1c94c2 100644
--- a/tests/unit/views/preview_image_test.py
+++ b/tests/unit/views/preview_image_test.py
@@ -2,16 +2,8 @@
 
 from funnel.views.thumbnails import render_project_preview_image
 
-@pytest.mark.usefixtures('app_context', 'project_expo2011')
-@pytest.fixture()
-def add_tasks_to_queue(project_expo2011):
-    from funnel import rq
-    rq.job_class = 'rq.job.Job'
-    rq.queues = ['funnel_testing']
-    return render_project_preview_image.queue(project_id=project_expo2011.id)
-
-@pytest.mark.usefixtures('add_tasks_to_queue', 'project_expo2011', 'project_ai1',
-                         'all_fixtures')
-def test_preview_image_jobs(project_expo2011, project_ai1):
+@pytest.mark.usefixtures('project_expo2011', 'all_fixtures')
+def test_preview_image_jobs(project_expo2011):
+    assert project_expo2011.preview_image is None
+    render_project_preview_image(project_id=project_expo2011.id)
     assert project_expo2011.preview_image is not None
-    assert project_ai1.preview_image is None

From 64d3918548bc8c834fe7ef1a1c5c62d861d1db54 Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Fri, 10 Nov 2023 14:50:58 +0530
Subject: [PATCH 20/27] add unit test to check mimetype and image resolution

---
 funnel/views/thumbnails.py             |  1 -
 tests/unit/views/preview_image_test.py | 11 ++++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/funnel/views/thumbnails.py b/funnel/views/thumbnails.py
index 7165648ac..a2ea47b99 100644
--- a/funnel/views/thumbnails.py
+++ b/funnel/views/thumbnails.py
@@ -8,7 +8,6 @@
 from flask import render_template
 from html2image import Html2Image
 
-from .. import rq
 from ..models import Project, db
 from ..signals import project_data_change
 from .jobs import rqjob
diff --git a/tests/unit/views/preview_image_test.py b/tests/unit/views/preview_image_test.py
index 9ad1c94c2..b037a8f6d 100644
--- a/tests/unit/views/preview_image_test.py
+++ b/tests/unit/views/preview_image_test.py
@@ -1,9 +1,18 @@
 import pytest
+import io
+from PIL import Image
 
 from funnel.views.thumbnails import render_project_preview_image
 
 @pytest.mark.usefixtures('project_expo2011', 'all_fixtures')
-def test_preview_image_jobs(project_expo2011):
+def test_preview_image_jobs(project_expo2011) -> None:
     assert project_expo2011.preview_image is None
     render_project_preview_image(project_id=project_expo2011.id)
     assert project_expo2011.preview_image is not None
+
+@pytest.mark.usefixtures('project_expo2011', 'all_fixtures')
+def test_preview_image_size(project_expo2011) -> None:
+    render_project_preview_image(project_id=project_expo2011.id)
+    preview_image = Image.open(io.BytesIO(project_expo2011.preview_image))
+    assert preview_image.size == (1280, 720)
+    assert preview_image.format is 'PNG'

From f98aa1bffbcc13a704e11326206cfbc5871ea339 Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Fri, 10 Nov 2023 16:32:24 +0530
Subject: [PATCH 21/27] Add mimetype sniffer and update test dependencies

---
 requirements/base.txt                  | 43 ++++++++++++--------------
 requirements/test.txt                  |  8 ++---
 tests/unit/views/preview_image_test.py |  4 ++-
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/requirements/base.txt b/requirements/base.txt
index 77478745d..9778b69a8 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -28,7 +28,7 @@ alembic==1.12.1
 aniso8601==9.0.1
     # via coaster
 anyio==4.0.0
-    # via httpcore
+    # via httpx
 argon2-cffi==23.1.0
     # via -r requirements/base.in
 argon2-cffi-bindings==21.2.0
@@ -55,15 +55,15 @@ bleach==6.1.0
     # via
     #   baseframe
     #   coaster
-blinker==1.6.3
+blinker==1.7.0
     # via
     #   -r requirements/base.in
     #   baseframe
     #   coaster
     #   flask
-boto3==1.28.72
+boto3==1.28.83
     # via -r requirements/base.in
-botocore==1.31.72
+botocore==1.31.83
     # via
     #   boto3
     #   s3transfer
@@ -83,7 +83,7 @@ cffi==1.16.0
     # via
     #   argon2-cffi-bindings
     #   cryptography
-charset-normalizer==3.3.1
+charset-normalizer==3.3.2
     # via
     #   aiohttp
     #   requests
@@ -114,7 +114,7 @@ dnspython==2.4.2
     #   pyisemail
 emoji==2.8.0
     # via baseframe
-filelock==3.12.4
+filelock==3.13.1
     # via tldextract
 flask==3.0.0
     # via
@@ -146,9 +146,9 @@ flask-caching==2.1.0
     # via baseframe
 flask-executor==1.0.0
     # via -r requirements/base.in
-flask-flatpages==0.8.1
+flask-flatpages==0.8.2
     # via -r requirements/base.in
-flask-mailman==0.3.0
+flask-mailman==1.0.0
     # via -r requirements/base.in
 flask-migrate==4.0.5
     # via
@@ -202,19 +202,19 @@ html5lib==1.1
     # via
     #   baseframe
     #   coaster
-httpcore==0.18.0
+httpcore==1.0.1
     # via httpx
 httplib2==0.22.0
     # via
     #   oauth2
     #   oauth2client
-httpx[http2]==0.25.0
+httpx[http2]==0.25.1
     # via
     #   -r requirements/base.in
     #   python-telegram-bot
 hyperframe==6.0.1
     # via h2
-icalendar==5.0.10
+icalendar==5.0.11
     # via -r requirements/base.in
 idna==3.4
     # via
@@ -248,9 +248,9 @@ linkify-it-py==2.0.2
     # via -r requirements/base.in
 lxml==4.9.3
     # via premailer
-mako==1.2.4
+mako==1.3.0
     # via alembic
-markdown==3.5
+markdown==3.5.1
     # via
     #   coaster
     #   flask-flatpages
@@ -270,14 +270,12 @@ markupsafe==2.1.3
     #   wtforms
 marshmallow==3.20.1
     # via dataclasses-json
-maxminddb==2.4.0
+maxminddb==2.5.1
     # via geoip2
 mdit-py-plugins==0.4.0
     # via -r requirements/base.in
 mdurl==0.1.2
     # via markdown-it-py
-mkdocs-material-extensions==1.3
-    # via flask-mailman
 multidict==6.0.4
     # via
     #   aiohttp
@@ -304,7 +302,7 @@ packaging==23.2
     #   marshmallow
 passlib==1.7.4
     # via -r requirements/base.in
-phonenumbers==8.13.23
+phonenumbers==8.13.24
     # via -r requirements/base.in
 premailer==3.10.0
     # via -r requirements/base.in
@@ -425,7 +423,7 @@ semantic-version==2.10.0
     # via
     #   baseframe
     #   coaster
-sentry-sdk==1.32.0
+sentry-sdk==1.34.0
     # via baseframe
 six==1.16.0
     # via
@@ -442,9 +440,8 @@ six==1.16.0
 sniffio==1.3.0
     # via
     #   anyio
-    #   httpcore
     #   httpx
-sqlalchemy==2.0.22
+sqlalchemy==2.0.23
     # via
     #   -r requirements/base.in
     #   alembic
@@ -463,7 +460,7 @@ statsd==4.0.1
     # via baseframe
 tinydb==4.8.0
     # via tuspy
-tldextract==5.0.1
+tldextract==5.1.0
     # via
     #   coaster
     #   mxsniff
@@ -475,7 +472,7 @@ tuspy==1.0.1
     # via pyvimeo
 tweepy==4.14.0
     # via -r requirements/base.in
-twilio==8.10.0
+twilio==8.10.1
     # via -r requirements/base.in
 types-python-dateutil==2.8.19.14
     # via arrow
@@ -524,7 +521,7 @@ werkzeug==3.0.1
     #   flask
 whitenoise==6.6.0
     # via -r requirements/base.in
-wtforms==3.1.0
+wtforms==3.1.1
     # via
     #   baseframe
     #   flask-wtf
diff --git a/requirements/test.txt b/requirements/test.txt
index facf4d46e..3f0798f76 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -64,9 +64,9 @@ pytest-cov==4.1.0
     # via -r requirements/test.in
 pytest-dotenv==0.5.2
     # via -r requirements/test.in
-pytest-env==1.1.0
+pytest-env==1.1.1
     # via -r requirements/test.in
-pytest-html==4.0.2
+pytest-html==4.1.1
     # via pytest-selenium
 pytest-metadata==3.0.0
     # via pytest-html
@@ -94,9 +94,9 @@ sttable==0.0.1
     # via -r requirements/test.in
 tenacity==8.2.3
     # via pytest-selenium
-tomlkit==0.12.1
+tomlkit==0.12.2
     # via -r requirements/test.in
-trio==0.22.2
+trio==0.23.1
     # via
     #   selenium
     #   trio-websocket
diff --git a/tests/unit/views/preview_image_test.py b/tests/unit/views/preview_image_test.py
index b037a8f6d..2c2dc438e 100644
--- a/tests/unit/views/preview_image_test.py
+++ b/tests/unit/views/preview_image_test.py
@@ -1,5 +1,6 @@
 import pytest
 import io
+from magic import from_buffer
 from PIL import Image
 
 from funnel.views.thumbnails import render_project_preview_image
@@ -14,5 +15,6 @@ def test_preview_image_jobs(project_expo2011) -> None:
 def test_preview_image_size(project_expo2011) -> None:
     render_project_preview_image(project_id=project_expo2011.id)
     preview_image = Image.open(io.BytesIO(project_expo2011.preview_image))
+    result = from_buffer(io.BytesIO(project_expo2011.preview_image).read(2048), mime=True)
     assert preview_image.size == (1280, 720)
-    assert preview_image.format is 'PNG'
+    assert result == 'image/png'

From b5c7b6270233328a8539d965ec127e4dc219db6f Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Fri, 10 Nov 2023 17:20:04 +0530
Subject: [PATCH 22/27] Add context manager for file handling

---
 tests/unit/views/preview_image_test.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/unit/views/preview_image_test.py b/tests/unit/views/preview_image_test.py
index 2c2dc438e..e4a6d5932 100644
--- a/tests/unit/views/preview_image_test.py
+++ b/tests/unit/views/preview_image_test.py
@@ -14,7 +14,7 @@ def test_preview_image_jobs(project_expo2011) -> None:
 @pytest.mark.usefixtures('project_expo2011', 'all_fixtures')
 def test_preview_image_size(project_expo2011) -> None:
     render_project_preview_image(project_id=project_expo2011.id)
-    preview_image = Image.open(io.BytesIO(project_expo2011.preview_image))
-    result = from_buffer(io.BytesIO(project_expo2011.preview_image).read(2048), mime=True)
-    assert preview_image.size == (1280, 720)
-    assert result == 'image/png'
+    with Image.open(io.BytesIO(project_expo2011.preview_image)) as preview_image:
+        assert preview_image.size == (1280, 720)
+    image_mimetype = from_buffer(io.BytesIO(project_expo2011.preview_image).read(2048), mime=True)
+    assert image_mimetype == 'image/png'

From 59f7b5b44031ab90b34356c59ebd38bae5ef8de8 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 15 Nov 2023 03:22:06 +0000
Subject: [PATCH 23/27] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 tests/unit/views/preview_image_test.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/unit/views/preview_image_test.py b/tests/unit/views/preview_image_test.py
index e4a6d5932..225dcd642 100644
--- a/tests/unit/views/preview_image_test.py
+++ b/tests/unit/views/preview_image_test.py
@@ -1,20 +1,25 @@
-import pytest
 import io
+
+import pytest
 from magic import from_buffer
 from PIL import Image
 
 from funnel.views.thumbnails import render_project_preview_image
 
+
 @pytest.mark.usefixtures('project_expo2011', 'all_fixtures')
 def test_preview_image_jobs(project_expo2011) -> None:
     assert project_expo2011.preview_image is None
     render_project_preview_image(project_id=project_expo2011.id)
     assert project_expo2011.preview_image is not None
 
+
 @pytest.mark.usefixtures('project_expo2011', 'all_fixtures')
 def test_preview_image_size(project_expo2011) -> None:
     render_project_preview_image(project_id=project_expo2011.id)
     with Image.open(io.BytesIO(project_expo2011.preview_image)) as preview_image:
         assert preview_image.size == (1280, 720)
-    image_mimetype = from_buffer(io.BytesIO(project_expo2011.preview_image).read(2048), mime=True)
+    image_mimetype = from_buffer(
+        io.BytesIO(project_expo2011.preview_image).read(2048), mime=True
+    )
     assert image_mimetype == 'image/png'

From b81bc89a964f56bb8faf329958176824925f5ac6 Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Thu, 16 Nov 2023 14:21:19 +0530
Subject: [PATCH 24/27] Testing if test definition fails at github actions

---
 tests/unit/views/preview_image_test.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/tests/unit/views/preview_image_test.py b/tests/unit/views/preview_image_test.py
index 225dcd642..f9492bf5f 100644
--- a/tests/unit/views/preview_image_test.py
+++ b/tests/unit/views/preview_image_test.py
@@ -1,6 +1,5 @@
-import io
-
 import pytest
+from io import BytesIO
 from magic import from_buffer
 from PIL import Image
 
@@ -15,11 +14,9 @@ def test_preview_image_jobs(project_expo2011) -> None:
 
 
 @pytest.mark.usefixtures('project_expo2011', 'all_fixtures')
-def test_preview_image_size(project_expo2011) -> None:
+def test_preview_image_size_mimeytpe(project_expo2011) -> None:
     render_project_preview_image(project_id=project_expo2011.id)
-    with Image.open(io.BytesIO(project_expo2011.preview_image)) as preview_image:
+    with Image.open(BytesIO(project_expo2011.preview_image)) as preview_image:
         assert preview_image.size == (1280, 720)
-    image_mimetype = from_buffer(
-        io.BytesIO(project_expo2011.preview_image).read(2048), mime=True
-    )
+    image_mimetype = from_buffer(BytesIO(project_expo2011.preview_image).read(2048), mime=True)
     assert image_mimetype == 'image/png'

From 81dd78c8fbc32bd839b3a98f0c2b4d6146dbabb0 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 16 Nov 2023 08:55:03 +0000
Subject: [PATCH 25/27] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 tests/unit/views/preview_image_test.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/unit/views/preview_image_test.py b/tests/unit/views/preview_image_test.py
index f9492bf5f..e3d31d0df 100644
--- a/tests/unit/views/preview_image_test.py
+++ b/tests/unit/views/preview_image_test.py
@@ -1,5 +1,6 @@
-import pytest
 from io import BytesIO
+
+import pytest
 from magic import from_buffer
 from PIL import Image
 
@@ -18,5 +19,7 @@ def test_preview_image_size_mimeytpe(project_expo2011) -> None:
     render_project_preview_image(project_id=project_expo2011.id)
     with Image.open(BytesIO(project_expo2011.preview_image)) as preview_image:
         assert preview_image.size == (1280, 720)
-    image_mimetype = from_buffer(BytesIO(project_expo2011.preview_image).read(2048), mime=True)
+    image_mimetype = from_buffer(
+        BytesIO(project_expo2011.preview_image).read(2048), mime=True
+    )
     assert image_mimetype == 'image/png'

From 70a0b5543ae2605c7980c4954689d70242336a20 Mon Sep 17 00:00:00 2001
From: anishTP <anish@hasgeek.com>
Date: Thu, 16 Nov 2023 20:45:46 +0530
Subject: [PATCH 26/27] Optimize preview image size and template

---
 funnel/templates/preview/project.html.jinja2 | 30 +++++++++++---------
 funnel/views/thumbnails.py                   |  3 +-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/funnel/templates/preview/project.html.jinja2 b/funnel/templates/preview/project.html.jinja2
index 89beed489..8fe90490e 100644
--- a/funnel/templates/preview/project.html.jinja2
+++ b/funnel/templates/preview/project.html.jinja2
@@ -7,15 +7,15 @@
             * {
               box-sizing: border-box;
               color: #1f2d3d;
-              font-weight: 700;
+              font-weight: 600;
               font-family: 'SegoeUI', 'Montserrat', 'Helvetica', sans-serif;
               padding: 0;
               margin: 0;
             }
 
             body {
-                width: 640px;
-                height: 360px
+                width: 320px;
+                height: 180px
             }
 
             .main-wrapper {
@@ -32,35 +32,37 @@
             }
 
             .project-title {
-                font-size: 2.5em;
+                font-size: 1.2em;
                 text-align: left;
-                padding-bottom: 1rem;
-                font-weight: 500;
-                border-bottom: 1px solid #1f2d3d;
+                padding-bottom: 0.5rem;
+                font-weight: 600;
+                border-bottom: 0.5px solid #1f2d3d;
             }
 
             .project-tagline {
-                padding-top: 1rem;
-                font-size: 1.5rem;
+                padding-top: 0.3rem;
+                font-size: 0.7rem;
                 font-weight: 300;
             }
             .title-wrapper{
                 line-height: 1.2;
                 text-align: left;
-                padding: 1.5em;
+                padding: 0.75em;
             }
 
             .organization-label{
+              font-size: 0.4rem;
               text-transform: uppercase;
-              padding-bottom: 0.5rem;
+              padding-bottom: 0.1rem;
             }
 
 
             .datetime-wrapper {
               position: absolute;
-              left: 1.5em;
-              bottom: 2em;
-              gap: 8em;
+              font-size: 0.5rem;
+              left: 1.35em;
+              bottom: 1.2em;
+              gap: 4rem;
               text-align: left;
               display: flex;
               justify-content: space-between;
diff --git a/funnel/views/thumbnails.py b/funnel/views/thumbnails.py
index a2ea47b99..82ca3e5fe 100644
--- a/funnel/views/thumbnails.py
+++ b/funnel/views/thumbnails.py
@@ -12,7 +12,6 @@
 from ..signals import project_data_change
 from .jobs import rqjob
 
-
 @project_data_change.connect
 def redo_project_preview_image(project: Project) -> None:
     render_project_preview_image.queue(project_id=project.id)
@@ -28,7 +27,7 @@ def render_project_preview_image(project_id: int) -> None:
     fd, temp_filepath = tempfile.mkstemp('.png')
     os.close(fd)
     temp_dir, temp_filename = os.path.split(temp_filepath)
-    hti = Html2Image(size=(640, 360), output_path=temp_dir)
+    hti = Html2Image(size=(320, 180), output_path=temp_dir)
     html_src = render_template('preview/project.html.jinja2', project=project)
     screenshot_files = hti.screenshot(html_str=html_src, save_as=temp_filename)
 

From bced406110a86dc3d5f8e72ae074a8802bb43b19 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 16 Nov 2023 15:18:13 +0000
Subject: [PATCH 27/27] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 funnel/views/thumbnails.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/funnel/views/thumbnails.py b/funnel/views/thumbnails.py
index 82ca3e5fe..9b37834f4 100644
--- a/funnel/views/thumbnails.py
+++ b/funnel/views/thumbnails.py
@@ -12,6 +12,7 @@
 from ..signals import project_data_change
 from .jobs import rqjob
 
+
 @project_data_change.connect
 def redo_project_preview_image(project: Project) -> None:
     render_project_preview_image.queue(project_id=project.id)
