From d1eb725339a91d29bd5d58fe8a9a3474b637475f Mon Sep 17 00:00:00 2001 From: RitvikSardana Date: Fri, 20 Dec 2024 23:23:21 +0530 Subject: [PATCH] refactor: use pyproject.toml instead of setup.py --- helpdesk/hooks.py | 2 -- helpdesk/search.py | 22 ++-------------------- pyproject.toml | 27 +++++++++++++++++++++++++++ requirements.txt | 2 -- setup.py | 19 ------------------- 5 files changed, 29 insertions(+), 43 deletions(-) create mode 100644 pyproject.toml delete mode 100644 requirements.txt delete mode 100644 setup.py diff --git a/helpdesk/hooks.py b/helpdesk/hooks.py index 6fca08d0f..76471474e 100644 --- a/helpdesk/hooks.py +++ b/helpdesk/hooks.py @@ -21,12 +21,10 @@ after_install = "helpdesk.setup.install.after_install" after_migrate = [ "helpdesk.search.build_index_in_background", - "helpdesk.search.download_corpus", ] scheduler_events = { "all": ["helpdesk.search.build_index_if_not_exists"], - "hourly": ["helpdesk.search.download_corpus"], } diff --git a/helpdesk/search.py b/helpdesk/search.py index 9d50bfa57..39026ccaf 100644 --- a/helpdesk/search.py +++ b/helpdesk/search.py @@ -126,9 +126,7 @@ def create_index(self): self._index_exists = True def add_synonyms(self): - for word, synonym in frappe.get_all( - "HD Synonym", ["parent", "name"], as_list=True - ): + for word, synonym in frappe.get_all("HD Synonym", ["parent", "name"], as_list=True): self.redis.ft(self.index_name).synupdate(word, True, word, synonym) def add_document(self, id, doc): @@ -325,9 +323,7 @@ def get_count(self, doctype): def get_records(self, doctype): records = [] filters = {"status": "Published"} if doctype == "HD Article" else {} - for d in frappe.db.get_all( - doctype, filters=filters, fields=self.DOCTYPE_FIELDS[doctype] - ): + for d in frappe.db.get_all(doctype, filters=filters, fields=self.DOCTYPE_FIELDS[doctype]): d.doctype = doctype if doctype == "HD Article": for heading, section in self.get_sections(d.content): @@ -396,17 +392,3 @@ def build_index_if_not_exists(): search = HelpdeskSearch() if not search.index_exists(): build_index() - - -@filelock("helpdesk_corpus_download", timeout=60) -def download_corpus(): - from nltk import data, download - - try: - data.find("taggers/averaged_perceptron_tagger_eng.zip") - data.find("tokenizers/punkt_tab.zip") - data.find("corpora/brown.zip") - except LookupError: - download("averaged_perceptron_tagger_eng") - download("punkt_tab") - download("brown") diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 000000000..5e449455b --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,27 @@ +[project] +name = "helpdesk" +authors = [ + { name = "Frappe Technologies Pvt Ltd", email = "hello@frappe.io"} +] +description = "Open Source Customer Service Software" +requires-python = ">=3.10" +readme = "README.md" +dynamic = ["version"] +dependencies = [ + # Core dependencies + "textblob==0.18.0.post0", +] + +[build-system] +requires = ["flit_core >=3.4,<4"] +build-backend = "flit_core.buildapi" + +[tool.black] +line-length = 99 + +[tool.isort] +multi_line_output = 3 +include_trailing_comma = true +force_grid_wrap = 0 +use_parentheses = true +ensure_newline_before_comments = true diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 25ae9e2cc..000000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -# frappe -- https://github.com/frappe/frappe is installed via 'bench init' -textblob==0.18.0.post0 diff --git a/setup.py b/setup.py deleted file mode 100644 index a4fe7e41b..000000000 --- a/setup.py +++ /dev/null @@ -1,19 +0,0 @@ -from setuptools import find_packages, setup - -with open("requirements.txt") as f: - install_requires = f.read().strip().split("\n") - -# get version from __version__ variable in frappedesk/__init__.py -from helpdesk import __version__ as version - -setup( - name="helpdesk", - version=version, - description="Customer Service Software", - author="Frappe Technologies", - author_email="hello@frappe.io", - packages=find_packages(), - zip_safe=False, - include_package_data=True, - install_requires=install_requires, -)