Merge branch 'master' into dependabot/pip/scipy-1.14.1

Author: jsolly

Procfile

@@ -0,0 +1 @@
+web: gunicorn app.app.wsgi --log-file - --timeout 120

app/app/settings/base_settings.py

@@ -7,7 +7,8 @@
 
 logger = logging.getLogger("django")
 
-load_dotenv()
+if "DYNO" not in os.environ:
+    load_dotenv()
 
 
 BASE_DIR = Path(__file__).resolve().parent.parent.parent  # Three levels up
@@ -222,7 +223,7 @@
         },
         "django.template": {
             "handlers": ["error_handler"],
-            "level": "INFO", # Change to DEBUG to see missing template vars errors
+            "level": "INFO",  # Change to DEBUG to see missing template vars errors
             "propagate": True,
         },
         "django.server": {

app/app/views.py

@@ -19,7 +19,7 @@ def privacy_view(request):
         request,
         context={
             "title": "Privacy Policy | Blogthedata.com",
-            "description": "This site collects IP addresses and geocodes them for use on a map. No personal information is collected. See the privacy policy for more information.",
+            "description": "I don't collect any information about you. I'm just a guy who likes to blog. You can read my privacy policy here.",
         },
         template_name="blog/privacy.html",
     )

app/app/wsgi.py

@@ -1,8 +1,4 @@
 import os
-from dotenv import load_dotenv
-
-load_dotenv("/home/jsolly/awesome-django-blog/.env")
-
 from django.core.wsgi import get_wsgi_application
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "app.settings.prod")

app/blog/templates/blog/parts/chatbox.html

@@ -7,27 +7,54 @@
                     <img src="{% static 'svg/man-avatar.svg' %}" alt="Ezra's avatar">
                 </div>
                 <div class="chatbox__content--header">
-                    <p class="chatbox__heading--header">Ask a Question</p>
-                    <p class="chatbox__description--header">Hi, I'm Ezra! I can answer questions about any blog post on
-                        this site!</p>
+                    <p class="chatbox__heading--header">Ezra</p>
+                    <p class="chatbox__time--header"> {% now "jS F Y" %} </p>
                 </div>
+                <div class="chatbox__close--header">
+                    <button aria-label="Close chatbox">
+                        <svg width="40" height="40" viewBox="0 0 1024 1024" version="1.1"
+                            xmlns="http://www.w3.org/2000/svg">
+                            <path
+                                d="M777.856 280.192l-33.92-33.952-231.872 231.872-231.84-231.872-33.984 33.888 231.872 231.904-231.84 231.84 33.888 33.984 231.904-231.904 231.84 231.872 33.952-33.888-231.872-231.904z" />
+                        </svg>
+                    </button>
+                </div>
+            </div>
+            <div class="chatbox__messages">
+                <div class="messages__item messages__item--bot"> I can answer questions about any blog post on this
+                    site! </div>
+                <div class="messages__item messages__item--bot"> Hi, I'm Ezra! </div>
             </div>
-            <div class="chatbox__messages"></div>
             <div class="chatbox__footer">
                 <form id="chatbox-submit">
                     {% csrf_token %}
-                    <textarea name="question-text-area" id="question-text-area" placeholder="Write a message..."
-                        hx-trigger="keyup[key === 'Enter' && !shiftKey]" hx-post="/answer-with-gpt/"
-                        hx-include="#question-text-area" hx-target=".chatbox__messages" hx-swap="afterbegin"></textarea>
-                    <button class="chatbox__send--footer send__button" hx-post="/answer-with-gpt/"
-                        hx-include="#question-text-area" hx-target=".chatbox__messages" hx-swap="afterbegin"
-                        aria-label="Send message">Send</button>
+                    <div class="chatbox__input-container">
+                        <textarea name="question-text-area" id="question-text-area" placeholder="Send a message..."
+                            hx-trigger="keyup[key === 'Enter' && !shiftKey]" hx-post="/answer-with-gpt/"
+                            hx-include="#question-text-area" hx-target=".chatbox__messages"
+                            hx-swap="afterbegin"></textarea>
+                        <button class="chatbox__send--footer send__button" hx-post="/answer-with-gpt/"
+                            hx-include="#question-text-area" hx-target=".chatbox__messages" hx-swap="afterbegin"
+                            aria-label="Send message">
+                            <svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 256 256">
+                                <g transform="translate(1.41 1.41) scale(2.81 2.81)">
+                                    <path
+                                        d="M 89.999 3.075 C 90 3.02 90 2.967 89.999 2.912 c -0.004 -0.134 -0.017 -0.266 -0.038 -0.398 c -0.007 -0.041 -0.009 -0.081 -0.018 -0.122 c -0.034 -0.165 -0.082 -0.327 -0.144 -0.484 c -0.018 -0.046 -0.041 -0.089 -0.061 -0.134 c -0.053 -0.119 -0.113 -0.234 -0.182 -0.346 C 89.528 1.382 89.5 1.336 89.469 1.29 c -0.102 -0.147 -0.212 -0.288 -0.341 -0.417 c -0.13 -0.13 -0.273 -0.241 -0.421 -0.344 c -0.042 -0.029 -0.085 -0.056 -0.129 -0.082 c -0.118 -0.073 -0.239 -0.136 -0.364 -0.191 c -0.039 -0.017 -0.076 -0.037 -0.116 -0.053 c -0.161 -0.063 -0.327 -0.113 -0.497 -0.147 c -0.031 -0.006 -0.063 -0.008 -0.094 -0.014 c -0.142 -0.024 -0.285 -0.038 -0.429 -0.041 C 87.03 0 86.983 0 86.936 0.001 c -0.141 0.003 -0.282 0.017 -0.423 0.041 c -0.035 0.006 -0.069 0.008 -0.104 0.015 c -0.154 0.031 -0.306 0.073 -0.456 0.129 L 1.946 31.709 c -1.124 0.422 -1.888 1.473 -1.943 2.673 c -0.054 1.199 0.612 2.316 1.693 2.838 l 34.455 16.628 l 16.627 34.455 C 53.281 89.344 54.334 90 55.481 90 c 0.046 0 0.091 -0.001 0.137 -0.003 c 1.199 -0.055 2.251 -0.819 2.673 -1.943 L 89.815 4.048 c 0.056 -0.149 0.097 -0.3 0.128 -0.453 c 0.008 -0.041 0.011 -0.081 0.017 -0.122 C 89.982 3.341 89.995 3.208 89.999 3.075 z M 75.086 10.672 L 37.785 47.973 L 10.619 34.864 L 75.086 10.672 z M 55.136 79.381 L 42.027 52.216 l 37.302 -37.302 L 55.136 79.381 z"
+                                        fill="rgb(0,0,0)" stroke-linecap="round" />
+                                </g>
+                            </svg>
+                        </button>
+                    </div>
                 </form>
             </div>
+            <div class="chatbox__footer--small">
+                <p>Powered by <a href="https://blogthedata.com">Blogthedata</a></p>
+            </div>
         </div>
         <div class="chatbox__button">
-            <button aria-label="Toggle chatbox"><img id="chatbox-icon" src="{% static 'svg/chatbox-icon.svg' %}"
-                    alt="Chatbox icon" /></button>
+            <button aria-label="Toggle chatbox">
+                <img id="chatbox-icon" src="{% static 'svg/chatbox-icon.svg' %}" alt="Chatbox icon" />
+            </button>
         </div>
     </div>
 </div>

app/blog/utils.py

@@ -1,5 +1,6 @@
 from openai import Embedding, Completion
-from openai.embeddings_utils import distances_from_embeddings
+from typing import List
+from scipy import spatial
 import pickle
 from pathlib import Path
 from sklearn.feature_extraction.text import TfidfVectorizer
@@ -25,6 +26,24 @@ def load_pickle_file():
 global_df = load_pickle_file()
 
 
+def distances_from_embeddings(
+    query_embedding: List[float],
+    embeddings: List[List[float]],
+    distance_metric="cosine",
+) -> List[List]:
+    distance_metrics = {
+        "cosine": spatial.distance.cosine,
+        "L1": spatial.distance.cityblock,
+        "L2": spatial.distance.euclidean,
+        "Linf": spatial.distance.chebyshev,
+    }
+    distances = [
+        distance_metrics[distance_metric](query_embedding, embedding)
+        for embedding in embeddings
+    ]
+    return distances
+
+
 def create_context(question, df, max_len=1800, size="ada"):
     """
     Create a context for a question by finding the most similar context from the dataframe
@@ -108,13 +127,13 @@ def preprocess_text(text: str) -> str:
     # Remove punctuation marks
     text = text.translate(str.maketrans("", "", string.punctuation))
     # Remove numbers
-    text = re.sub(r'\d+', '', text)
+    text = re.sub(r"\d+", "", text)
     # Remove extra whitespaces
-    text = re.sub(r'\s+', ' ', text)
+    text = re.sub(r"\s+", " ", text)
     # Remove stopwords
-    nltk.download('stopwords')
-    stop_words = set(stopwords.words('english'))
-    text = ' '.join([word for word in text.split() if word not in stop_words])
+    nltk.download("stopwords")
+    stop_words = set(stopwords.words("english"))
+    text = " ".join([word for word in text.split() if word not in stop_words])
     return text
 
 
@@ -123,9 +142,10 @@ def getPostChunks(post: Post, chunk_size: int = 1800) -> list:
     Split the post content into chunks of specified size
     """
     content = preprocess_text(post.content)
-    chunks = [content[i:i + chunk_size] for i in range(0, len(content), chunk_size)]
+    chunks = [content[i : i + chunk_size] for i in range(0, len(content), chunk_size)]
     return chunks
 
+
 def compute_similarity(post_id: int) -> None:
     post = Post.objects.get(id=post_id)
     other_posts = Post.objects.exclude(id=post_id).exclude(content="")
@@ -135,7 +155,8 @@ def compute_similarity(post_id: int) -> None:
 
     # Create a list of (chunk, post_pk) tuples for all other posts
     combined_texts_and_pks = [
-        (chunk, other_post.pk) for other_post in other_posts
+        (chunk, other_post.pk)
+        for other_post in other_posts
         for chunk in getPostChunks(other_post)
     ]
 
@@ -152,18 +173,24 @@ def compute_similarity(post_id: int) -> None:
         return
 
     cosine_sim = cosine_similarity(tfidf_matrix[0:1], tfidf_matrix[1:])
-    
+
     # Calculate the number of similar posts to consider
     num_similar_posts = min(len(set(post_pks)) - 1, 3)  # Exclude the target post itself
 
     # Get the top indices, but make sure to map them back to unique post PKs
     top_indices = np.argsort(-cosine_sim[0])[:num_similar_posts]
-    unique_top_pks = {post_pks[i + 1] for i in top_indices}  # +1 to skip the first post itself
+    unique_top_pks = {
+        post_pks[i + 1] for i in top_indices
+    }  # +1 to skip the first post itself
 
     for pk in unique_top_pks:
-        idx = combined_texts_and_pks.index(next(filter(lambda x: x[1] == pk, combined_texts_and_pks)))
+        idx = combined_texts_and_pks.index(
+            next(filter(lambda x: x[1] == pk, combined_texts_and_pks))
+        )
         Similarity.objects.update_or_create(
             post1=post,
             post2=Post.objects.get(pk=pk),
-            defaults={"score": cosine_sim[0][idx - 1]},  # Adjust index for cosine_sim offset
-        )
+            defaults={
+                "score": cosine_sim[0][idx - 1]
+            },  # Adjust index for cosine_sim offset
+        )

app/manage.py

@@ -1,14 +1,17 @@
 #!/usr/bin/env python
 import sys
+import os
 from pathlib import Path
 from dotenv import load_dotenv
 from django.core.management.utils import get_random_secret_key
 
-load_dotenv()
+if "DYNO" not in os.environ:
+    load_dotenv()
+
 
 def setup_env():
-    env_example_path = Path('.') / '.env.example'
-    env_path = Path('.') / '.env'
+    env_example_path = Path(".") / ".env.example"
+    env_path = Path(".") / ".env"
 
     if env_path.exists():
         print(".env file already exists. Exiting.")
@@ -20,24 +23,27 @@ def setup_env():
 
     secret_key = get_random_secret_key()
 
-    with open(env_example_path, 'r') as example_file:
+    with open(env_example_path, "r") as example_file:
         env_content = example_file.readlines()
 
-    with open(env_path, 'w') as env_file:
+    with open(env_path, "w") as env_file:
         for line in env_content:
-            key_value = line.strip().split('=', 1)
-            if key_value[0] == 'SECRET_KEY':
-                env_file.write(f'SECRET_KEY={secret_key}\n')
+            key_value = line.strip().split("=", 1)
+            if key_value[0] == "SECRET_KEY":
+                env_file.write(f"SECRET_KEY={secret_key}\n")
             else:
-                env_file.write(key_value[0] + '=' + key_value[1].split('#')[0].strip() + '\n')
+                env_file.write(
+                    key_value[0] + "=" + key_value[1].split("#")[0].strip() + "\n"
+                )
 
     print(".env file created with a new SECRET_KEY and other values from .env.example.")
 
+
 # Make sure DJANGO_SETTINGS_MODULE is added to .env file
 def main():
-    if 'setup_env' in sys.argv:
+    if "setup_env" in sys.argv:
         setup_env()
-        sys.argv.remove('setup_env')
+        sys.argv.remove("setup_env")
 
     try:
         from django.core.management import execute_from_command_line