hafez 0.2.9__py3-none-any.whl → 0.3.0__py3-none-any.whl

hafez/entry.py

@@ -103,7 +103,7 @@ def get_poem(poem_id) -> dict:
     return lst_poem[0]
 
 
-def search(query) -> list:
+def search(query: str=None) -> 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

hafez/utils/db.py

@@ -1,4 +1,5 @@
 import pandas as pd
+import numpy as np
 import pathlib
 import os
 import json
@@ -28,14 +29,22 @@ def get_data(id: int = None):
 
 
 def search_data(query: str = None):
+    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))]
 
+        # 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.dist-info → hafez-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hafez
-Version: 0.2.9
+Version: 0.3.0
 Summary: Hafez Poems
 Author-email: Kaveh Bakhtiyari <kbakhtiyari@yahoo.com>
 Project-URL: Homepage, https://github.com/kavehbc/hafez
@@ -99,6 +99,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.dist-info → hafez-0.3.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 hafez/__init__.py,sha256=e6agkcalSQq5BQAqSxDOqOjEappydKY9T3N0LHLV9SU,257
-hafez/entry.py,sha256=JoKaNsnhisrrmPkwt6nHY7syaMlDPq4ZvwhRi30jr-E,3754
+hafez/entry.py,sha256=U2Ld2jJr4zTRJdc9Fx_Yi6OJM1bWxY8v2kWpCcZAnRc,3764
 hafez/data/hafez.json,sha256=SZW-vQCAHOcy75MB4pF0Wc0v7Wuaa6_PXccQvcVNuuI,2430767
 hafez/data/audio/do_not_delete_me.txt,sha256=Gh6YTvONnauMYf7pVXjjXiik5C_FSW-e9orhoxC3Nns,23
 hafez/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hafez/utils/db.py,sha256=peU1B0rSc1IUEhy802-MkGNN_9mQwKucBiVNI2WRFOM,1178
+hafez/utils/db.py,sha256=GTca0eLEK4C-as21Va7hP2My07St4iiHkNpDtukFriE,1450
 hafez/utils/formating.py,sha256=SlGtfVb30Q0Yg0qysgdoFcN4f-TbuxsxaN-aRE0HDSM,493
-hafez-0.2.9.dist-info/licenses/LICENSE,sha256=TSObqi3glpU9S9P6kSv8d488pt0Cc3xDgoUF6yHlx3g,1099
-hafez-0.2.9.dist-info/METADATA,sha256=wVWbH_DUGWhn0Y2TqGYhgHQAoDaDY8HEjl409KBWvFw,4012
-hafez-0.2.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-hafez-0.2.9.dist-info/top_level.txt,sha256=zl_xBZxOuP1dJA41E3Cnxb-LZrnLFhpu7JCz3UW5uDs,6
-hafez-0.2.9.dist-info/RECORD,,
+hafez-0.3.0.dist-info/licenses/LICENSE,sha256=TSObqi3glpU9S9P6kSv8d488pt0Cc3xDgoUF6yHlx3g,1099
+hafez-0.3.0.dist-info/METADATA,sha256=23FuzMgJjc0imCbbvKYtEDxZ8IS1fdNzzkF98VW-nys,4039
+hafez-0.3.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+hafez-0.3.0.dist-info/top_level.txt,sha256=zl_xBZxOuP1dJA41E3Cnxb-LZrnLFhpu7JCz3UW5uDs,6
+hafez-0.3.0.dist-info/RECORD,,