hafez 0.2.6__py3-none-any.whl → 0.2.8__py3-none-any.whl

hafez/entry.py

@@ -1,9 +1,9 @@
 import random
-from typing import Tuple, Optional
+from typing import Optional
 import requests
 import os
 import pathlib
-from hafez.utils.db import get_data, search_data
+from hafez.utils.db import filter_columns, get_data, search_data
 from hafez.utils.formating import df_to_dict
 
 URI_MP3_FOLDER = str(
@@ -97,6 +97,7 @@ def get_poem(poem_id) -> dict:
     :return: a dictionary containing the poem verses and its interpretation
     """
     df = get_data(poem_id)
+    df = filter_columns(df)
     lst_poem = df_to_dict(df)
 
     return lst_poem[0]
@@ -109,6 +110,7 @@ def search(query) -> list:
     :return: a list of dictionary containing all the poems which have the queried terms
     """
     df = search_data(query)
+    df = filter_columns(df)
     lst_poem = df_to_dict(df)
 
     return lst_poem

hafez/utils/db.py

@@ -1,56 +1,46 @@
 import pandas as pd
-import sqlite3
-from sqlite3 import Connection
 import pathlib
 import os
 import json
 
 URI_DB_FOLDER = str(pathlib.Path(os.path.abspath(os.path.dirname(__file__))).parents[0].resolve())
-URI_SQLITE_DB = URI_DB_FOLDER + "/data/hafez.db"
 URI_JSON_DB = URI_DB_FOLDER + "/data/hafez.json"
 
 
+def filter_columns(df: pd.DataFrame) -> pd.DataFrame:
+    """
+    This function filters the columns of the DataFrame.
+    :param df: DataFrame
+    :return: DataFrame with selected columns
+    """
+    columns = ["id", "poem", "interpretation", "alt_interpretation", "mp3"]
+    df = df[columns]
+    return df
+
 def get_data(id: int = None):
-    id = str(id)
-    conn = get_connection()
-    alt_explanation = ""
-
-    if id is None:
-        sql_query = "SELECT * FROM poems"
-    else:
-        sql_query = f"SELECT * FROM poems WHERE id = {id}"
-        with open(URI_JSON_DB, "r", encoding="utf8") as json_db:
-            json_data = json.load(json_db)
-        if id in json_data.keys():
-            alt_explanation = json_data[id]["explanation"]
-
-    df = pd.read_sql(sql_query, con=conn)
-    df["alt_interpretation"] = alt_explanation
+
+    _, df = get_connection()
+
+    if id is not None:
+        df = df[df["id"] == id]
+
     return df
 
 
 def search_data(query: str = None):
-    conn = get_connection()
-    if query is None or len(query) == 0:
-        sql_query = "SELECT * FROM poems"
-    else:
+
+    _, 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(" ")
-        sql_query = f"SELECT * FROM poems WHERE"
-        i = 0
-        for item in lst_query:
-            if i > 0:
-                sql_query += f" AND"
-            sql_query += f" Poem LIKE '%{item}%'"
-            i += 1
-
-    df = pd.read_sql(sql_query, con=conn)
-    df["alt_interpretation"] = ""
+        df = df[df["poem_string"].str.contains('|'.join(lst_query))]
+
     return df
 
 
-def get_connection() -> Connection:
-    """Put the connection in cache to reuse if path does not change between Streamlit reruns.
-    NB : https://stackoverflow.com/questions/48218065/programmingerror-sqlite-objects-created-in-a-thread-can-only-be-used-in-that-sa
-    """
-    db_con = sqlite3.connect(URI_SQLITE_DB, check_same_thread=False)
-    return db_con
+def get_connection():
+    with open(URI_JSON_DB, "r", encoding="utf8") as json_db:
+        json_data = json.load(json_db)
+    df = pd.DataFrame(json_data)
+    return json_data, df

hafez/utils/formating.py

@@ -3,22 +3,7 @@ def mp3_id_formatting(id: int) -> str:
 
 
 def df_to_dict(df):
-    lst_poems = []
-    for index, row in df.iterrows():
-        poem_id = row["id"]
-        str_poem = row["Poem"]
-        lst_verses = str_poem.split("\\r\\n")
-        if "" in lst_verses:
-            lst_verses.remove("")
-
-        str_interpretation = row["Interpretation"]
-        str_alt_interpretation = row["alt_interpretation"]
-        dic_poem = {"id": poem_id,
-                    "poem": lst_verses,
-                    "interpretation": str_interpretation,
-                    "alt_interpretation": str_alt_interpretation,
-                    "mp3": f"https://de.loveziba.com/2019/10/{mp3_id_formatting(poem_id)}.mp3"}
-        lst_poems.append(dic_poem)
+    lst_poems = df.to_dict(orient='records')
     return lst_poems
 
 

{hafez-0.2.6.dist-info → hafez-0.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: hafez
-Version: 0.2.6
+Version: 0.2.8
 Summary: Hafez Poems
 Author-email: Kaveh Bakhtiyari <kbakhtiyari@yahoo.com>
 Project-URL: Homepage, https://github.com/kavehbc/hafez
@@ -11,6 +11,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: license-file
 
 # Divan Hafez Poems & Omen
 

hafez-0.2.8.dist-info/RECORD

@@ -0,0 +1,12 @@
+hafez/__init__.py,sha256=e6agkcalSQq5BQAqSxDOqOjEappydKY9T3N0LHLV9SU,257
+hafez/entry.py,sha256=JoKaNsnhisrrmPkwt6nHY7syaMlDPq4ZvwhRi30jr-E,3754
+hafez/data/hafez.json,sha256=K7bDXuMFxfwAD3p2L1tXgqH41aFZaeksO7Y-pUmvkdU,2573404
+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/formating.py,sha256=SlGtfVb30Q0Yg0qysgdoFcN4f-TbuxsxaN-aRE0HDSM,493
+hafez-0.2.8.dist-info/licenses/LICENSE,sha256=TSObqi3glpU9S9P6kSv8d488pt0Cc3xDgoUF6yHlx3g,1099
+hafez-0.2.8.dist-info/METADATA,sha256=OhkJ6Z_ux-4sMAH1jYAnKJUNvr88g1qhKqyS5nObmJg,4012
+hafez-0.2.8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+hafez-0.2.8.dist-info/top_level.txt,sha256=zl_xBZxOuP1dJA41E3Cnxb-LZrnLFhpu7JCz3UW5uDs,6
+hafez-0.2.8.dist-info/RECORD,,

{hafez-0.2.6.dist-info → hafez-0.2.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

hafez-0.2.6.dist-info/RECORD

@@ -1,13 +0,0 @@
-hafez/__init__.py,sha256=e6agkcalSQq5BQAqSxDOqOjEappydKY9T3N0LHLV9SU,257
-hafez/entry.py,sha256=aU6nOYKbZUFq5HeYrLEFrc7MEZuW_YqKxk9QBMI6Yzg,3687
-hafez/data/hafez.db,sha256=aCntb5yFQMaNnoIwehFTHKUE3s6FYtb3fauiH4l08xc,954368
-hafez/data/hafez.json,sha256=HvKVYI86wtWGRP9G0CLI5sE5ExoBgRHB78n6d8Prl_U,797858
-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=e0LG7keJwT_uEMkV8mkdQ4cnbopAqhRS3y-VUHwFIyQ,1766
-hafez/utils/formating.py,sha256=-E7L-w-6xSDPSqK4ZLKMOAfVzRoGRjilLclOwJHphUg,1128
-hafez-0.2.6.dist-info/LICENSE,sha256=TSObqi3glpU9S9P6kSv8d488pt0Cc3xDgoUF6yHlx3g,1099
-hafez-0.2.6.dist-info/METADATA,sha256=O1-FlpWwZgB07xrAodCg8Pz9K51qA_8lkSNUI9XKGkA,3989
-hafez-0.2.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-hafez-0.2.6.dist-info/top_level.txt,sha256=zl_xBZxOuP1dJA41E3Cnxb-LZrnLFhpu7JCz3UW5uDs,6
-hafez-0.2.6.dist-info/RECORD,,