optz

bot1/chats.py

@@ -22,7 +22,7 @@ import logging
 
 logger = logging.getLogger()
 from misc import SaveFileMapping, SaveFileObject
-from lxml.html.clean import clean_html, Cleaner
+#from lxml.html.clean import clean_html, Cleaner
 import settings
 solr = SolrFet2020()
 

bot1/users.py

@@ -1,6 +1,7 @@
 from misc import SaveFileMapping, SaveFileObject
 from dataclasses import dataclass
 from pytgbot.api_types.receivable.updates import Update
+import lazymappingstorage
 
 def get_from_id(update):
     if update.message and update.message.to_array():
@@ -38,7 +39,7 @@ class User(SaveFileObject):
 
 
 class UserManager(SaveFileMapping):
-    def __init__(self):
+    def __init__(self,file="users.yaml"):
         super().__init__(file="users.yaml")
         self.from_file()
 

solrfet2020/__init__.py

@@ -1,4 +1,3 @@
-from lxml.html.clean import clean_html, Cleaner
 
 import settings
 
@@ -49,5 +48,5 @@ class SolrFet2020:
         )
 
         links = result_to_object(r)
-        # print(yaml.dump(r))
+
         return links, r.hits

solrfet2020/convert.py

@@ -1,4 +1,4 @@
-from lxml.html.clean import clean_html, Cleaner
+#from lxml.html.clean import clean_html, Cleaner
 from bs4 import BeautifulSoup
 
 

solrfet2020/utils.py

@@ -1,11 +1,10 @@
 from lxml.html.clean import clean_html, Cleaner
 from fet2020api import fet2020postapi, fet2020memberapi
 from urllib.parse import urljoin,urlparse
-from . import env
+import settings
 
-
-fet=fet2020postapi(urljoin(env('TARGET'),"api/posts/"))
-fetmember=fet2020memberapi(urljoin(env('TARGET'),"api/members/"))
+fet=fet2020postapi(urljoin(settings.TARGET,"api/posts/"))
+fetmember=fet2020memberapi(urljoin(settings.TARGET,"api/members/"))
 
 
 def replace_special(t):