hafez 0.2.9__tar.gz → 0.4.0__tar.gz

{hafez-0.2.9/hafez.egg-info → hafez-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hafez
-Version: 0.2.9
+Version: 0.4.0
 Summary: Hafez Poems
 Author-email: Kaveh Bakhtiyari <kbakhtiyari@yahoo.com>
 Project-URL: Homepage, https://github.com/kavehbc/hafez
@@ -65,11 +65,12 @@ It returns the poem in a dictionary format (see Poem Data Structure)
 It returns a random poem in a dictionary format (see Poem Data Structure)
 
 
-- `hafez.search(qeury: str)` -> `list`
+- `hafez.search(qeury: str, exact_match: bool = False)` -> `list`
 <br />
 It returns a list of poems in a dictionary format (see Poem Data Structure)
   
   - `query: str`: It is a string to search within the verses of the Divan Hafez
+  - `exact_match: bool': if True, it will search for exact match of the query
 
 
 - `hafez.download_all_audio(force: boolean = False)` -> `int`
@@ -99,6 +100,7 @@ It returns the absolute path of the audio file related to the given  `poem`.
 {"id": 1,
 "poem": [],
 "interpretation": "",
+"alt_interpretation": "",
 "mp3": "https://..."}
 ```
 

{hafez-0.2.9 → hafez-0.4.0}/README.md

@@ -50,11 +50,12 @@ It returns the poem in a dictionary format (see Poem Data Structure)
 It returns a random poem in a dictionary format (see Poem Data Structure)
 
 
-- `hafez.search(qeury: str)` -> `list`
+- `hafez.search(qeury: str, exact_match: bool = False)` -> `list`
 <br />
 It returns a list of poems in a dictionary format (see Poem Data Structure)
   
   - `query: str`: It is a string to search within the verses of the Divan Hafez
+  - `exact_match: bool': if True, it will search for exact match of the query
 
 
 - `hafez.download_all_audio(force: boolean = False)` -> `int`
@@ -84,6 +85,7 @@ It returns the absolute path of the audio file related to the given  `poem`.
 {"id": 1,
 "poem": [],
 "interpretation": "",
+"alt_interpretation": "",
 "mp3": "https://..."}
 ```
 

{hafez-0.2.9 → hafez-0.4.0}/hafez/entry.py

@@ -103,13 +103,14 @@ def get_poem(poem_id) -> dict:
     return lst_poem[0]
 
 
-def search(query) -> list:
+def search(query: str=None, exact_match: bool = False) -> list:
     """
     It searches through the verses of Divan and once a record found, it returns the whole poem.
     :param query: the string term to query into Divan
+    :param exact_match: if True, it will search for exact match of the query
     :return: a list of dictionary containing all the poems which have the queried terms
     """
-    df = search_data(query)
+    df = search_data(query, exact_match=exact_match)
     df = filter_columns(df)
     lst_poem = df_to_dict(df)
 

{hafez-0.2.9 → hafez-0.4.0}/hafez/utils/db.py

@@ -1,4 +1,5 @@
 import pandas as pd
+import numpy as np
 import pathlib
 import os
 import json
@@ -27,15 +28,30 @@ def get_data(id: int = None):
     return df
 
 
-def search_data(query: str = None):
+def search_data(query: str = None, exact_match: bool = False) -> pd.DataFrame:
+    query = query.strip()
 
     _, df = get_connection()
     df['poem_string'] = [','.join(map(str, l)) for l in df['poem']]
 
     if query is not None and len(query) > 0:
-        lst_query = query.split(" ")
-        df = df[df["poem_string"].str.contains('|'.join(lst_query))]
-
+        if exact_match:
+            lst_query = [query]
+        else:
+            # Split the query into words for searching
+            if " " in query:
+                lst_query = query.split(" ")
+            else:
+                lst_query = [query]
+
+        # AND Logic
+        contains = [df["poem_string"].str.contains(i) for i in lst_query]
+        df = df[np.all(contains, axis=0)]
+
+        # OR Logic
+        # df = df[df["poem_string"].str.contains('|'.join(lst_query))]
+
+    df.drop(columns=["poem_string"], inplace=True, axis=1)
     return df
 
 

{hafez-0.2.9 → hafez-0.4.0/hafez.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hafez
-Version: 0.2.9
+Version: 0.4.0
 Summary: Hafez Poems
 Author-email: Kaveh Bakhtiyari <kbakhtiyari@yahoo.com>
 Project-URL: Homepage, https://github.com/kavehbc/hafez
@@ -65,11 +65,12 @@ It returns the poem in a dictionary format (see Poem Data Structure)
 It returns a random poem in a dictionary format (see Poem Data Structure)
 
 
-- `hafez.search(qeury: str)` -> `list`
+- `hafez.search(qeury: str, exact_match: bool = False)` -> `list`
 <br />
 It returns a list of poems in a dictionary format (see Poem Data Structure)
   
   - `query: str`: It is a string to search within the verses of the Divan Hafez
+  - `exact_match: bool': if True, it will search for exact match of the query
 
 
 - `hafez.download_all_audio(force: boolean = False)` -> `int`
@@ -99,6 +100,7 @@ It returns the absolute path of the audio file related to the given  `poem`.
 {"id": 1,
 "poem": [],
 "interpretation": "",
+"alt_interpretation": "",
 "mp3": "https://..."}
 ```
 

{hafez-0.2.9 → hafez-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hafez"
-version = "0.2.9"
+version = "0.4.0"
 authors = [
     { name = "Kaveh Bakhtiyari", email = "kbakhtiyari@yahoo.com" },
 ]

hafez-0.4.0/requirements.txt

@@ -0,0 +1,4 @@
+pandas>=1.5.3
+numpy>=1.23.5
+requests~=2.31.0
+setuptools~=68.2.2

hafez-0.2.9/requirements.txt

@@ -1,3 +0,0 @@
-pandas>=1.5.3
-requests~=2.31.0
-setuptools~=68.2.2