WomenPlusPlus · krugergui · Oct 28, 2023 · Oct 27, 2023 · Oct 27, 2023 · Oct 27, 2023
diff --git a/.github/workflows/black.yml → .github/workflows/req_lint_test.yml b/.github/workflows/black.yml → .github/workflows/req_lint_test.yml
@@ -1,14 +1,14 @@
-name: python auto-format
+name: requirements_lint_test
 on:
   # Triggers the workflow on push to all the branches and on pull request to the "master" or the "dev" branch
   push:
   pull_request:
-    branches: [ "master", "dev"]
+    branches: [ "master", "dev", "backend", "pytest"]
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 jobs:
-  lint:
+  test-n-lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -17,6 +17,7 @@ jobs:
 
       - name: Install dependencies
         run: |
+          python -m pip install -r src/backend/requirements.txt
           python -m pip install -r requirements_git_actions.txt
 
       - name: apply_black
@@ -28,4 +29,9 @@ jobs:
           options: "--check --verbose"
           src: "."
           jupyter: true
-          version: "~= 22.0"
+          version: "~= 22.0"
+
+      - name: Test with pytest
+        run: |
+          pytest
+
diff --git a/notebooks/languages.csv b/notebooks/languages.csv
@@ -0,0 +1,204 @@
+Abkhazian
+Afar
+Afrikaans
+Akan
+Albanian
+Amharic
+Arabic
+Aragonese
+Armenian
+Assamese
+Avaric
+Avestan
+Aymara
+Azerbaijani
+Bambara
+Bashkir
+Basque
+Belarusian
+Bengali
+Bislama
+Bosnian
+Breton
+Bulgarian
+Burmese
+Catalan
+Valencian
+Chamorro
+Chechen
+Chichewa
+Chewa
+Nyanja
+Chinese
+Church Slavonic
+Chuvash
+Cornish
+Corsican
+Cree
+Croatian
+Czech
+Danish
+Divehi
+Dhivehi
+Maldivian
+Dutch
+Flemish
+Dzongkha
+English
+Esperanto
+Estonian
+Ewe
+Faroese
+Fijian
+Finnish
+French
+Western Frisian
+Fulah
+Gaelic
+Scottish Gaelic
+Galician
+Ganda
+Georgian
+German
+Greek
+Kalaallisut
+Greenlandic
+Guarani
+Gujarati
+Haitian
+Haitian Creole
+Hausa
+Hebrew
+Herero
+Hindi
+Hiri Motu
+Hungarian
+Icelandic
+Ido
+Igbo
+Indonesian
+Interlingua
+Inuktitut
+Inupiaq
+Irish
+Italian
+Japanese
+Javanese
+Kannada
+Kanuri
+Kashmiri
+Kazakh
+Central Khmer
+Kikuyu
+Gikuyu
+Kinyarwand
+Kirghiz
+Kyrgyz
+Komi
+Kongo
+Korean
+Kuanyama
+Kwanyama
+Kurdish
+Lao
+Latin
+Latvian
+Limburgan
+Limburger
+Limburgish
+Lingala
+Lithuanian
+Luba-Katanga
+Luxembourgish
+Letzeburgesch
+Macedonian
+Malagasy
+Malay
+Malayalam
+Maltes
+Manx
+Maori
+Marathi
+Marshallese
+Mongolian
+Nauru
+Navajo
+Navaho
+North Ndebele
+South Ndebele
+Ndonga
+Nepali
+Norwegian
+Norwegian Bokmål
+Norwegian Nynorsk
+Sichuan Yi
+Nuosu
+Occitan
+Ojibwa
+Oriya
+Oromo
+Ossetian
+Ossetic
+Pali
+Pashto
+Pushto
+Persian
+Polish
+Portuguese
+Punjabi
+Panjabi
+Quechua
+Romanian
+Moldavian
+Moldovan
+Northern Sami
+Samoan
+Sango
+Sanskrit
+Sardinian
+Serbian
+Shona
+Sindhi
+Sinhala
+Sinhalese
+Slovak
+Slovenian
+Somali
+Southern Sotho
+Spanish
+Castilian
+Sundanese
+Swahili
+Swati
+Swedish
+Tagalog
+Tahitian
+Tajik
+Tamil
+Tatar
+Telugu
+Thai
+Tibetan
+Tigrinya
+Tsonga
+Tsonga
+Tswana
+Turkish
+Turkmen
+Twi
+Uighur
+Ukrainian
+Urdu
+Uzbek
+Venda
+Vietnamese
+Volapük
+Walloon
+Welsh
+Wolof
+Xhosa
+Yiddish
+Yoruba
+Zhuang
+Chuang
+Zulu
diff --git a/requirements_git_actions.txt b/requirements_git_actions.txt
@@ -1,2 +1,3 @@
 black==23.9.1
-black[jupyter]
+black[jupyter]
+pytest==7.4.3
diff --git a/backend/api/migrations/__init__.py → src/__init__.py b/backend/api/migrations/__init__.py → src/__init__.py
diff --git a/backend/.dockerignore → src/backend/.dockerignore b/backend/.dockerignore → src/backend/.dockerignore
diff --git a/backend/.env.template → src/backend/.env.template b/backend/.env.template → src/backend/.env.template
diff --git a/backend/.gitignore → src/backend/.gitignore b/backend/.gitignore → src/backend/.gitignore
diff --git a/backend/Dockerfile → src/backend/Dockerfile b/backend/Dockerfile → src/backend/Dockerfile
diff --git a/backend/README.md → src/backend/README.md b/backend/README.md → src/backend/README.md
diff --git a/backend/api/__init__.py → src/backend/api/__init__.py b/backend/api/__init__.py → src/backend/api/__init__.py
diff --git a/backend/api/auth_models.py → src/backend/api/auth_models.py b/backend/api/auth_models.py → src/backend/api/auth_models.py
diff --git a/backend/api/auth_token.py → src/backend/api/auth_token.py b/backend/api/auth_token.py → src/backend/api/auth_token.py
diff --git a/backend/api/authentication_services.py → src/backend/api/authentication_services.py b/backend/api/authentication_services.py → src/backend/api/authentication_services.py
diff --git a/backend/api/matching_algorithm.py → src/backend/api/matching_algorithm.py b/backend/api/matching_algorithm.py → src/backend/api/matching_algorithm.py
@@ -1,4 +1,5 @@
 from typing import List
+import torch
 from sklearn.metrics.pairwise import cosine_similarity
 
 
@@ -27,3 +28,9 @@ def get_free_text_match(
         return 0
 
     return cosine_similarity(candidate_embeddings, job_embeddings)[0][0]
+
+if __name__=="__main__":
+    print(int(get_free_text_match(
+    torch.tensor([[1,0,0]]),
+    torch.tensor([[-1,0,0]]),
+))==-1)
diff --git a/backend/api/middleware.py → src/backend/api/middleware.py b/backend/api/middleware.py → src/backend/api/middleware.py
diff --git a/backend/api/migrate_skills_to_long.py → src/backend/api/migrate_skills_to_long.py b/backend/api/migrate_skills_to_long.py → src/backend/api/migrate_skills_to_long.py
diff --git a/backend/api/migrations/0001_initial.py → src/backend/api/migrations/0001_initial.py b/backend/api/migrations/0001_initial.py → src/backend/api/migrations/0001_initial.py
diff --git a/.../0002_alter_associations_name_and_more.py → .../0002_alter_associations_name_and_more.py b/.../0002_alter_associations_name_and_more.py → .../0002_alter_associations_name_and_more.py
diff --git a/...ame_file_name_candidatesdocuments_file.py → ...ame_file_name_candidatesdocuments_file.py b/...ame_file_name_candidatesdocuments_file.py → ...ame_file_name_candidatesdocuments_file.py
diff --git a/backend/api/migrations/0004_resfreshtoken.py → ...kend/api/migrations/0004_resfreshtoken.py b/backend/api/migrations/0004_resfreshtoken.py → ...kend/api/migrations/0004_resfreshtoken.py
diff --git a/...005_refreshtokens_delete_resfreshtoken.py → ...005_refreshtokens_delete_resfreshtoken.py b/...005_refreshtokens_delete_resfreshtoken.py → ...005_refreshtokens_delete_resfreshtoken.py
diff --git a/backend/api/migrations/0006_sessions.py → src/backend/api/migrations/0006_sessions.py b/backend/api/migrations/0006_sessions.py → src/backend/api/migrations/0006_sessions.py
diff --git a/...nd/api/migrations/0007_delete_sessions.py → ...nd/api/migrations/0007_delete_sessions.py b/...nd/api/migrations/0007_delete_sessions.py → ...nd/api/migrations/0007_delete_sessions.py
diff --git a/...rations/0008_alter_refreshtokens_table.py → ...rations/0008_alter_refreshtokens_table.py b/...rations/0008_alter_refreshtokens_table.py → ...rations/0008_alter_refreshtokens_table.py
diff --git a/..._supabase_authenticaiton_uuid_and_more.py → ..._supabase_authenticaiton_uuid_and_more.py b/..._supabase_authenticaiton_uuid_and_more.py → ..._supabase_authenticaiton_uuid_and_more.py
diff --git a/...pi/migrations/0010_supabaseidtouserids.py → ...pi/migrations/0010_supabaseidtouserids.py b/...pi/migrations/0010_supabaseidtouserids.py → ...pi/migrations/0010_supabaseidtouserids.py
diff --git a/...0011_alter_supabaseidtouserids_user_id.py → ...0011_alter_supabaseidtouserids_user_id.py b/...0011_alter_supabaseidtouserids_user_id.py → ...0011_alter_supabaseidtouserids_user_id.py
diff --git a/...ter_countries_country_it_code_and_more.py → ...ter_countries_country_it_code_and_more.py b/...ter_countries_country_it_code_and_more.py → ...ter_countries_country_it_code_and_more.py
diff --git a/..._associationusers_designation_and_more.py → ..._associationusers_designation_and_more.py b/..._associationusers_designation_and_more.py → ..._associationusers_designation_and_more.py
diff --git a/...associationusers_email_adress_and_more.py → ...associationusers_email_adress_and_more.py b/...associationusers_email_adress_and_more.py → ...associationusers_email_adress_and_more.py
diff --git a/...r_candidates_accepted_privacy_and_more.py → ...r_candidates_accepted_privacy_and_more.py b/...r_candidates_accepted_privacy_and_more.py → ...r_candidates_accepted_privacy_and_more.py
diff --git a/...ations/0016_alter_companies_invited_by.py → ...ations/0016_alter_companies_invited_by.py b/...ations/0016_alter_companies_invited_by.py → ...ations/0016_alter_companies_invited_by.py
diff --git a/...tions/0017_alter_candidates_invited_by.py → ...tions/0017_alter_candidates_invited_by.py b/...tions/0017_alter_candidates_invited_by.py → ...tions/0017_alter_candidates_invited_by.py
diff --git a/...igrations/0018_availablecompanydomains.py → ...igrations/0018_availablecompanydomains.py b/...igrations/0018_availablecompanydomains.py → ...igrations/0018_availablecompanydomains.py
diff --git a/...rename_email_companyusers_email_adress.py → ...rename_email_companyusers_email_adress.py b/...rename_email_companyusers_email_adress.py → ...rename_email_companyusers_email_adress.py
diff --git a/...scription_candidates_about_me_and_more.py → ...scription_candidates_about_me_and_more.py b/...scription_candidates_about_me_and_more.py → ...scription_candidates_about_me_and_more.py
diff --git a/...ions/0021_alter_candidates_hard_skills.py → ...ions/0021_alter_candidates_hard_skills.py b/...ions/0021_alter_candidates_hard_skills.py → ...ions/0021_alter_candidates_hard_skills.py
diff --git a/...ions/0022_alter_candidates_hard_skills.py → ...ions/0022_alter_candidates_hard_skills.py b/...ions/0022_alter_candidates_hard_skills.py → ...ions/0022_alter_candidates_hard_skills.py
diff --git a/...andidates_supabase_authenticaiton_uuid.py → ...andidates_supabase_authenticaiton_uuid.py b/...andidates_supabase_authenticaiton_uuid.py → ...andidates_supabase_authenticaiton_uuid.py
diff --git a/...ions/0024_alter_candidates_last_update.py → ...ions/0024_alter_candidates_last_update.py b/...ions/0024_alter_candidates_last_update.py → ...ions/0024_alter_candidates_last_update.py
diff --git a/...tions/0025_alter_candidates_created_at.py → ...tions/0025_alter_candidates_created_at.py b/...tions/0025_alter_candidates_created_at.py → ...tions/0025_alter_candidates_created_at.py
diff --git a/...company_id_companies_id_companies_name.py → ...company_id_companies_id_companies_name.py b/...company_id_companies_id_companies_name.py → ...company_id_companies_id_companies_name.py
diff --git a/...bs_hard_skills_jobs_languages_and_more.py → ...bs_hard_skills_jobs_languages_and_more.py b/...bs_hard_skills_jobs_languages_and_more.py → ...bs_hard_skills_jobs_languages_and_more.py
diff --git a/...ompany_alter_jobs_hard_skills_and_more.py → ...ompany_alter_jobs_hard_skills_and_more.py b/...ompany_alter_jobs_hard_skills_and_more.py → ...ompany_alter_jobs_hard_skills_and_more.py
diff --git a/...ates_hard_skill_test_matching_and_more.py → ...ates_hard_skill_test_matching_and_more.py b/...ates_hard_skill_test_matching_and_more.py → ...ates_hard_skill_test_matching_and_more.py
diff --git a/...t_name_associations_last_name_and_more.py → ...t_name_associations_last_name_and_more.py b/...t_name_associations_last_name_and_more.py → ...t_name_associations_last_name_and_more.py
diff --git a/...rst_name_companies_first_name_and_more.py → ...rst_name_companies_first_name_and_more.py b/...rst_name_companies_first_name_and_more.py → ...rst_name_companies_first_name_and_more.py
diff --git a/...2_candidates_aboutme_embedded_and_more.py → ...2_candidates_aboutme_embedded_and_more.py b/...2_candidates_aboutme_embedded_and_more.py → ...2_candidates_aboutme_embedded_and_more.py
diff --git a/src/backend/api/migrations/0032_skills_skill_new_col.py b/src/backend/api/migrations/0032_skills_skill_new_col.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.2.5 on 2023-10-25 08:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0031_rename_main_contact_first_name_companies_first_name_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='skills',
+            name='skill_new_col',
+            field=models.CharField(default='some string', max_length=255),
+            preserve_default=False,
+        ),
+    ]
diff --git a/src/backend/api/migrations/0033_remove_skills_skill_new_col.py b/src/backend/api/migrations/0033_remove_skills_skill_new_col.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.5 on 2023-10-25 08:55
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0032_skills_skill_new_col'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='skills',
+            name='skill_new_col',
+        ),
+    ]
diff --git a/...s_aboutme_experinece_embedded_and_more.py → ...s_aboutme_experinece_embedded_and_more.py b/...s_aboutme_experinece_embedded_and_more.py → ...s_aboutme_experinece_embedded_and_more.py
diff --git a/src/backend/api/migrations/0034_candidates_aboutme_experinece_embedded_and_more.py b/src/backend/api/migrations/0034_candidates_aboutme_experinece_embedded_and_more.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.5 on 2023-10-26 15:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0033_remove_skills_skill_new_col'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='candidates',
+            name='aboutme_experinece_embedded',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]
diff --git a/backend/shift_3_womenpp/__init__.py → src/backend/api/migrations/__init__.py b/backend/shift_3_womenpp/__init__.py → src/backend/api/migrations/__init__.py
diff --git a/backend/api/mixed_router.py → src/backend/api/mixed_router.py b/backend/api/mixed_router.py → src/backend/api/mixed_router.py
diff --git a/backend/api/model_serializers.py → src/backend/api/model_serializers.py b/backend/api/model_serializers.py → src/backend/api/model_serializers.py
diff --git a/backend/api/models.py → src/backend/api/models.py b/backend/api/models.py → src/backend/api/models.py
diff --git a/backend/api/routers.py → src/backend/api/routers.py b/backend/api/routers.py → src/backend/api/routers.py
diff --git a/backend/api/selector.py → src/backend/api/selector.py b/backend/api/selector.py → src/backend/api/selector.py
diff --git a/backend/api/serializer_services.py → src/backend/api/serializer_services.py b/backend/api/serializer_services.py → src/backend/api/serializer_services.py
diff --git a/backend/api/serializers.py → src/backend/api/serializers.py b/backend/api/serializers.py → src/backend/api/serializers.py
diff --git a/backend/api/services.py → src/backend/api/services.py b/backend/api/services.py → src/backend/api/services.py
diff --git a/src/backend/api/skill_db_relax_20.json b/src/backend/api/skill_db_relax_20.json
diff --git a/backend/api/skill_extractor.py → src/backend/api/skill_extractor.py b/backend/api/skill_extractor.py → src/backend/api/skill_extractor.py
diff --git a/src/backend/api/token_dist.json b/src/backend/api/token_dist.json
diff --git a/backend/api/tokenization_n_embedding.py → src/backend/api/tokenization_n_embedding.py b/backend/api/tokenization_n_embedding.py → src/backend/api/tokenization_n_embedding.py
@@ -1,7 +1,6 @@
 import torch
 from typing import List
 from transformers import AutoTokenizer, AutoModel
-from sklearn.metrics.pairwise import cosine_similarity
 
 
 MODEL_NAME = "bert-base-uncased"
@@ -46,3 +45,6 @@ def generate_embeddings(text: str, model_name: str=MODEL_NAME) -> List[List]:
     text_embeddings = text_outputs.last_hidden_state.mean(dim=1)
     return text_embeddings
 
+if __name__=="__main__":
+    s = ""
+    print(generate_embeddings(s)[0][0].item()==-0.00922924280166626)
diff --git a/backend/api/views.py → src/backend/api/views.py b/backend/api/views.py → src/backend/api/views.py
diff --git a/backend/api/views_schemas.py → src/backend/api/views_schemas.py b/backend/api/views_schemas.py → src/backend/api/views_schemas.py
diff --git a/backend/compose.yaml → src/backend/compose.yaml b/backend/compose.yaml → src/backend/compose.yaml
diff --git a/backend/docker_requirements.txt → src/backend/docker_requirements.txt b/backend/docker_requirements.txt → src/backend/docker_requirements.txt
diff --git a/backend/gunicorn.conf.py → src/backend/gunicorn.conf.py b/backend/gunicorn.conf.py → src/backend/gunicorn.conf.py
diff --git a/backend/manage.py → src/backend/manage.py b/backend/manage.py → src/backend/manage.py
diff --git a/backend/requirements.txt → src/backend/requirements.txt b/backend/requirements.txt → src/backend/requirements.txt
diff --git a/backend/schema.yml → src/backend/schema.yml b/backend/schema.yml → src/backend/schema.yml
diff --git a/src/backend/shift_3_womenpp/__init__.py b/src/backend/shift_3_womenpp/__init__.py
diff --git a/backend/shift_3_womenpp/ngnix.conf → src/backend/shift_3_womenpp/ngnix.conf b/backend/shift_3_womenpp/ngnix.conf → src/backend/shift_3_womenpp/ngnix.conf
diff --git a/backend/shift_3_womenpp/settings.py → src/backend/shift_3_womenpp/settings.py b/backend/shift_3_womenpp/settings.py → src/backend/shift_3_womenpp/settings.py
diff --git a/backend/shift_3_womenpp/urls.py → src/backend/shift_3_womenpp/urls.py b/backend/shift_3_womenpp/urls.py → src/backend/shift_3_womenpp/urls.py
diff --git a/backend/shift_3_womenpp/wsgi.py → src/backend/shift_3_womenpp/wsgi.py b/backend/shift_3_womenpp/wsgi.py → src/backend/shift_3_womenpp/wsgi.py
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/test_embedding_similarity.py b/tests/test_embedding_similarity.py
@@ -0,0 +1,31 @@
+import torch
+import sys
+import os
+from src.backend.api.tokenization_n_embedding import tokenize_text, generate_embeddings
+from src.backend.api.matching_algorithm import get_free_text_match
+
+def test_tokenize_text():
+    text_tokens_keys = set(['input_ids','token_type_ids','attention_mask'])
+    assert set(tokenize_text("test").keys()) == \
+        text_tokens_keys
+    assert set(tokenize_text("").keys()) == \
+        text_tokens_keys
+
+def test_generate_embeddings():
+    assert len(generate_embeddings("any text")) == 1
+    assert len(generate_embeddings("any text")[0]) == 768
+    assert generate_embeddings("").dtype == torch.float32
+
+def test_get_free_text_match_text():
+    assert get_free_text_match(
+            torch.tensor([[1,2,3]]),
+            torch.tensor([[-1,-2,-3]])
+    ) == -1
+    assert get_free_text_match(
+            torch.tensor([[1,2,3]]),
+            torch.tensor([[1,2,3]])
+    ) == 1
+    assert get_free_text_match(
+    torch.tensor([[1,0,0]]),
+    torch.tensor([[0,1,0]]),
+    ) == 0