Merge pull request #299 from Seluj78/294-recommendations

Recommendations + Search

Author: supalarry

PyMatcha.postman_collection.json

@@ -2616,7 +2616,7 @@
 											"    pm.response.to.have.status(200);",
 											"});",
 											"",
-											"tests[\"Is geohash correct\"] = response.geohash == \"spb8kg12wgw3\""
+											"tests[\"Is geohash correct\"] = response.geohash == \"gbqc2cm8zj0h\""
 										],
 										"type": "text/javascript"
 									}
@@ -5817,6 +5817,44 @@
 						}
 					},
 					"response": []
+				},
+				{
+					"name": "{{host}}/search/values",
+					"event": [
+						{
+							"listen": "test",
+							"script": {
+								"id": "800e378b-5cbb-46c3-94b3-1a25db03a846",
+								"exec": [
+									"var response = JSON.parse(responseBody);",
+									"",
+									"",
+									"pm.test(\"Status code is 200\", function () {",
+									"    pm.response.to.have.status(200);",
+									"});",
+									"",
+									"tests[\"Success is true\"] = response.success == true",
+									""
+								],
+								"type": "text/javascript"
+							}
+						}
+					],
+					"request": {
+						"method": "GET",
+						"header": [],
+						"url": {
+							"raw": "{{host}}/search/values",
+							"host": [
+								"{{host}}"
+							],
+							"path": [
+								"search",
+								"values"
+							]
+						}
+					},
+					"response": []
 				}
 			],
 			"protocolProfileBehavior": {}
@@ -6012,107 +6050,107 @@
 	],
 	"variable": [
 		{
-			"id": "1c6f53dc-e42f-4454-9bc3-ed7efc324c5e",
+			"id": "1422b800-5b00-4e83-b384-b0a2335ce1f6",
 			"key": "host",
 			"value": "http://127.0.0.1:5000"
 		},
 		{
-			"id": "795d11f0-db2d-4e43-bcce-51e4dd7d403e",
+			"id": "45b4ac16-259f-4039-9f45-9e687dde7c56",
 			"key": "user_id",
 			"value": ""
 		},
 		{
-			"id": "c10e1323-93da-441c-a4aa-ab8a56d127fa",
+			"id": "9bcded74-14bb-43ec-96a6-ddbace075f06",
 			"key": "user_email",
 			"value": "foo@example.org"
 		},
 		{
-			"id": "4e4339d4-037b-4a47-a940-af44ceba7702",
+			"id": "caaaaaa8-3409-4c18-bb84-8f7413b74119",
 			"key": "user_username",
 			"value": "foo"
 		},
 		{
-			"id": "200e3227-ae76-482b-8806-afdf11e4a946",
+			"id": "0c2a62b7-cae4-4b2e-861a-d18d8852cd3a",
 			"key": "user_password",
 			"value": "admin"
 		},
 		{
-			"id": "6c1cbef8-de33-45b3-8e95-0b2c42bfba72",
+			"id": "87dc2468-5256-468f-82d5-2ac67426c9c2",
 			"key": "user_firstname",
 			"value": "Foo"
 		},
 		{
-			"id": "220b0df3-d386-4dae-9439-77361ed5397f",
+			"id": "a991a290-b276-4ec3-b728-5545bdb0f865",
 			"key": "user_lastname",
 			"value": "Bar"
 		},
 		{
-			"id": "2740c551-4c1a-4fd4-b14c-437c2e5b176d",
+			"id": "50fcf6ff-9a13-4ac4-bd55-f62f208213fd",
 			"key": "debug_token",
 			"value": "xX69jules69Xx"
 		},
 		{
-			"id": "558a8390-adec-4afb-9414-5c305ce932e2",
+			"id": "cbcf5b56-8099-433e-9f44-729df553e8f4",
 			"key": "user_access_token",
 			"value": ""
 		},
 		{
-			"id": "19668937-3689-4bb3-97e4-ad0262b20779",
+			"id": "19085103-b960-4e72-9ddb-c6f496f731af",
 			"key": "user_refresh_token",
 			"value": ""
 		},
 		{
-			"id": "922cef0c-ac18-4509-9f08-7240f04a9634",
+			"id": "56764f2f-ab0d-46fc-8690-2dacb95006e2",
 			"key": "expired_token",
 			"value": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1OTAyNDIyNjQsIm5iZiI6MTU5MDI0MjI2NCwianRpIjoiNTM0ZGI5NzQtOWE4Ni00MGViLWE1NDEtMDg3N2ZmNzQ3NDVhIiwiZXhwIjoxNTkwMjQyMzI0LCJpZGVudGl0eSI6eyJpZCI6NTEyLCJlbWFpbCI6ImZvb0BleGFtcGxlLm9yZyIsInVzZXJuYW1lIjoiYmFyIiwiaXNfb25saW5lIjp0cnVlLCJkYXRlX2xhc3RzZWVuIjoiU2F0LCAyMyBNYXkgMjAyMCAxMzo1Nzo0NCBHTVQifSwiZnJlc2giOnRydWUsInR5cGUiOiJhY2Nlc3MifQ.NTp2P0WNkXDwzuzrcNIQdeAfizQ57HQgkzBLSvY1yHU"
 		},
 		{
-			"id": "425325f9-1bd7-4f0c-9863-f3f44a0546e1",
+			"id": "4f2dc328-0d84-455e-b539-3eedb52ad509",
 			"key": "user_orientation",
 			"value": "heterosexual"
 		},
 		{
-			"id": "cb3e3a95-1cef-4b63-a0c1-41bea9ac7abe",
+			"id": "c1c3b0d9-d693-4c3e-bfe1-790246f36975",
 			"key": "user_bio",
 			"value": "Lorem Ipsum is the single greatest threat. We are not - we are not keeping up with other websites. Lorem Ipsum best not make any more threats to your website. It will be met with fire and fury like the world has never seen. Does everybody know that pig named Lorem Ipsum? An ‘extremely credible source’ has called my office and told me that Barack Obama’s placeholder text is a fraud."
 		},
 		{
-			"id": "5595875e-6866-4d62-94a5-e24ea59e40d7",
+			"id": "22247a60-3b04-4cf3-b71e-020be5e5af2b",
 			"key": "user_gender",
 			"value": "male"
 		},
 		{
-			"id": "4f00c819-d5a2-4ffa-9841-927a584a73ad",
+			"id": "73131f55-444b-435c-a1a2-3d8dac1757e9",
 			"key": "user_birthdate",
 			"value": "06/04/1998"
 		},
 		{
-			"id": "ae73bd61-998f-4741-98d2-3a9c832e5d3b",
+			"id": "d5f365e6-94c6-4e8c-b26b-71e29927db28",
 			"key": "user_lat",
 			"value": "44.8404"
 		},
 		{
-			"id": "05660d8f-92d8-492d-bda0-a1e5f0d76dee",
+			"id": "1e75fc16-8889-4c28-8749-f2d8fd4f5012",
 			"key": "user_lng",
 			"value": "-0.5805"
 		},
 		{
-			"id": "62c639b4-dd0c-435f-b00c-139ef0e6d334",
+			"id": "32238ac7-ecee-43bb-822d-e58cee7f4d75",
 			"key": "user_ip",
 			"value": "77.205.46.181"
 		},
 		{
-			"id": "d7d84d53-5ce3-48a5-9171-5177c9f4bd29",
+			"id": "2918a794-4b28-4b66-9ff1-277bfe8173a7",
 			"key": "user_username2",
 			"value": "FooBar"
 		},
 		{
-			"id": "b5b77a26-ee98-445b-9fc9-efd9a5421d4e",
+			"id": "7ebb04be-74e9-4823-9b4e-8b658e59194d",
 			"key": "user_email2",
 			"value": "bar@example.org"
 		},
 		{
-			"id": "0112646c-3f47-431b-a92c-179babdf271f",
+			"id": "24f73465-8c81-47f1-ba70-7bead50632dc",
 			"key": "user_password2",
 			"value": "dolphin2"
 		}

backend/PyMatcha/models/user.py

@@ -63,6 +63,7 @@ class User(Model):
     is_confirmed = Field(bool)
     confirmed_on = Field(datetime.datetime, fmt="%Y-%m-%d %H:%M:%S")
     previous_reset_token = Field(str)
+    skip_recommendations = Field(bool)
 
     @staticmethod
     def create(
@@ -83,6 +84,7 @@ def create(
         is_profile_completed: bool = False,
         is_confirmed: bool = False,
         confirmed_on: datetime.datetime = None,
+        skip_recommendations: bool = False,
     ) -> User:
         # Check email availability
         if User.get(email=email):
@@ -136,6 +138,7 @@ def create(
             is_confirmed=is_confirmed,
             confirmed_on=confirmed_on,
             previous_reset_token=None,
+            skip_recommendations=skip_recommendations,
         )
         new_user.save()
         logging.debug("New user {} created".format(new_user.email))
@@ -175,6 +178,7 @@ def register(email: str, username: str, password: str, first_name: str, last_nam
             is_confirmed=False,
             confirmed_on=None,
             previous_reset_token=None,
+            skip_recommendations=False,
         )
         new_user.save()
         logging.debug("New user {} created".format(new_user.email))

backend/PyMatcha/routes/api/profile/edit.py

@@ -19,12 +19,12 @@
 import datetime
 
 import Geohash
+import requests
 from flask import Blueprint
 from flask import render_template
 from flask import request
 from flask_jwt_extended import current_user
 from flask_jwt_extended import jwt_required
-from ip2geotools.databases.noncommercial import DbIpCity
 from PyMatcha.models.user import get_user
 from PyMatcha.utils import hash_password
 from PyMatcha.utils.confirm_token import generate_confirmation_token
@@ -156,9 +156,11 @@ def edit_geolocation():
     if lat and lng:
         current_user.geohash = Geohash.encode(lat, lng)
     else:
-        response = DbIpCity.get(ip, api_key="free")
-        lat = response.latitude
-        lng = response.longitude
+        response = requests.get(
+            f"http://api.ipstack.com/{ip}?access_key=b5f9be2253823006b478da121d1c855b&format=1"
+        ).json()
+        lat = response["latitude"]
+        lng = response["longitude"]
         current_user.geohash = Geohash.encode(lat, lng)
     current_user.save()
     return Success("New location sucessfully saved.")

backend/PyMatcha/routes/api/search.py

@@ -78,11 +78,13 @@ def search():
             if max_distance != -1:
                 raise BadRequestError("user needs to sets his location first")
 
-        user_tags = [t.name for t in user.get_tags()]
-        common_tags = _get_common_tags(tags, user_tags)
-        if not common_tags:
-            common_tags = []
-            if tags:
+        common_tags = []
+        if tags:
+            user_tags = [t.name for t in user.get_tags()]
+            common_tags = _get_common_tags(tags, user_tags)
+            if not common_tags:
+                # No tags has been found
+                common_tags = []
                 continue
 
         user_dict = user.to_dict()

backend/PyMatcha/utils/match_score.py

@@ -22,7 +22,7 @@ def _get_common_tags(tag_list_1: list, tag_list_2: list) -> List[str]:
     common_tags = []
     for tag_1 in tag_list_1:
         for tag_2 in tag_list_2:
-            if fuzz.partial_ratio(tag_1, tag_2) >= 70:
+            if fuzz.partial_ratio(tag_1, tag_2) >= 90:
                 common_tags.append(tag_1 if len(tag_1) > len(tag_2) else tag_2)
     return list(set(common_tags))
 

backend/PyMatcha/utils/populate_database.py

@@ -14,10 +14,14 @@
 from PyMatcha.models.user import User
 from PyMatcha.utils.errors import ConflictError
 from randomuser import RandomUser
+from tqdm import tqdm
 
 FRANCE_GEOHASH_START = ("u0", "gb", "ez", "sp")
 NATIONALITIES_PARAMS = {"nat": "fr"}
 
+# LATVIA_GEOHASH_START = ("d0", "d1", "d4", "d4")
+# NATIONALITIES_PARAMS = {"nat": "lv"}
+
 
 def gen_datetime(min_year: int = 1900, max_year: int = datetime.datetime.now().year) -> datetime.datetime:
     # generate a datetime in format yyyy-mm-dd hh:mm:ss.000000
@@ -27,6 +31,19 @@ def gen_datetime(min_year: int = 1900, max_year: int = datetime.datetime.now().y
     return start + (end - start) * random.random()
 
 
+def get_unsplash_image(gender):
+    link = None
+    while True:
+        r = requests.get(f"https://source.unsplash.com/featured/?{gender}")
+        if r.status_code == 403:
+            sleep(1)
+            continue
+        link = r.url
+        if not Image.get(link=link):
+            break
+    return link
+
+
 def populate_users(amount=150, drop_user_table=False):
     if drop_user_table:
         User.drop_table()
@@ -36,7 +53,7 @@ def populate_users(amount=150, drop_user_table=False):
     except HTTPError:
         sleep(10)
         users = RandomUser.generate_users(amount=amount, get_params=NATIONALITIES_PARAMS)
-    for user in users:
+    for user in tqdm(users):
         gender = random.choice(["male", "female", "other"])
         if gender != "other":
             if gender == user.get_gender():
@@ -87,7 +104,14 @@ def populate_users(amount=150, drop_user_table=False):
 
             for tag in tags:
                 Tag.create(name=tag, user_id=u.id)
-            image_url = requests.get(f"https://picsum.photos/seed/{username}/1000/1000").url
+
+            if gender == "other":
+                # Change the gender because the profile picture needs to be of a person
+                gender = random.choice(["male", "female"])
+            image_url = get_unsplash_image("man" if gender == "male" else "woman")
+            if not image_url:
+                raise ValueError("ERROR ON GETTING IMAGE FROM UNSPLASH")
+
             Image.create(user_id=u.id, link=image_url, is_primary=True)
         except ConflictError:
             pass  # Pass on the conflict error, this user wont be created because the username is taken. Who cares ?

backend/PyMatcha/utils/tables.py

@@ -48,7 +48,8 @@ def _create_user_table(db):
         is_online            BOOLEAN DEFAULT (FALSE),
         is_profile_completed BOOLEAN DEFAULT (FALSE),
         is_confirmed         BOOLEAN DEFAULT (FALSE),
-        confirmed_on         DATETIME DEFAULT NULL
+        confirmed_on         DATETIME DEFAULT NULL,
+        skip_recommendations BOOLEAN DEFAULT (FALSE)
         ) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci ;
         """
         )

backend/PyMatcha/utils/tasks.py

@@ -107,8 +107,9 @@ def update_offline_users():
 @celery.task
 def update_user_recommendations():
     count = 0
-    for user_to_update in User.select_all():
+    for user_to_update in User.get_multis(skip_recommendations=False):
         create_user_recommendations(user_to_update)
+        count += 1
     return f"Successfully updated recommendations for {count} users."
 
 

backend/requirements.txt

@@ -26,8 +26,7 @@ pre-commit==2.7.1
 
 lorem==0.1.1
 future==0.18.2
-ip2geotools==0.1.5
-
+requests==2.24.0
 argon2-cffi==20.1.0
 
 geopy==2.0.0

frontend/package.json

@@ -14,6 +14,7 @@
     "axios": "^0.20.0",
     "core-js": "^3.6.5",
     "jwt-decode": "^3.0.0-beta.2",
+    "nouislider": "^14.6.2",
     "secure-ls": "^1.2.6",
     "tailwindcss": "^1.8.10",
     "vee-validate": "^3.3.11",