esentity 0.2.301__tar.gz → 0.2.303__tar.gz

{esentity-0.2.301 → esentity-0.2.303}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: esentity
-Version: 0.2.301
+Version: 0.2.303
 Summary: Elasticsearch Entity Tools
 Home-page: https://slotmarks.com
 Author: Slotmarks

esentity-0.2.303/esentity/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.2.303'

{esentity-0.2.301 → esentity-0.2.303}/esentity/api.py

@@ -1125,8 +1125,9 @@ class ApiAuthLogin(Resource):
 
                         session['actor'] = obj.to_dict()
 
-                        msg = ':man: Auth success: {0}, IP: {1} [{2}]'.format(obj.username, current_user.ip, current_user.location_iso.upper())
-                        send_notify.apply_async(args=[msg, 'notify'])
+                        if not data.get('silent', False):
+                            msg = ':man: Auth success: {0}, IP: {1} [{2}]'.format(obj.username, current_user.ip, current_user.location_iso.upper())
+                            send_notify.apply_async(args=[msg, 'notify'])
 
                         return {'ok': True, 'user': obj.to_dict()}
                     else:

{esentity-0.2.301 → esentity-0.2.303}/esentity/models.py

@@ -964,45 +964,36 @@ class Page(ElasticEntity):
         return None
 
     @classmethod
-    def query(cls, query, is_full=False, locale_list=[], category=[], page=1, count=10, match_type='bool_prefix'):
-        if not query:
-            return []
+    def query(cls, query, is_full=False, _locale=[], category=[], page=1, count=10):
+        if not query or not str(query).strip():
+            return
 
         def escape_query_string(text):
             # Экранируем спецсимволы Lucene: + - = && || > < ! ( ) { } [ ] ^ " ~ * ? : \ /
-            # return re.sub(r'([+\-=&|><!(){}\[\]^"~*?:\\/])', r'\\\1', text)
-            return text.replace('-', ' ')
+            return re.sub(r'([+\-=&|><!(){}\[\]^"~*?:\\/])', lambda m: '\\' + m.group(1), text)
+
+        query_str = str(query).strip().replace('-', ' ')
+        raw_words = query_str.split()
+        clean_words = [escape_query_string(w) for w in raw_words if escape_query_string(w)]
+
+        if not clean_words:
+            return
 
-        query = ' AND '.join([f'*{escape_query_string(item)}*' for item in query.split()])
+        query_parts = [f'({w}^20 OR {w}*^10 OR *{w}*)' for w in clean_words]
+        query_string = ' AND '.join(query_parts)
 
         must = [
-            # {"multi_match" : {
-            #     "query": query, 
-            #     "type": match_type,
-            #     "fields": [
-            #         "suggest",
-            #         "suggest._2gram",
-            #         "suggest._3gram",
-            #         "title^3",
-            #         "alias",
-            #         "intro^2",
-            #         "overview",
-            #         "content",
-            #     ] 
-            # }}
             {
                 "query_string": {
-                    "query": query,
+                    "query": query_string,
                     "fields": [
-                        # "suggest",
-                        # "suggest._2gram",
-                        # "suggest._3gram",
-                        "title^3",
-                        "alias",
+                        "title^10",
+                        "alias^8",
+                        "website^5",
+                        "suggest^4",
                         "intro^2",
-                        "overview",
-                        "content",
-                        "website",
+                        # "overview^1",
+                        # "content^0.5",
                     ] 
                 }
             }
@@ -1018,20 +1009,44 @@ class Page(ElasticEntity):
             if category:
                 must.append({"terms": {"category.keyword": category}})
 
-            # TODO: search slots and casinos ??? 
-            # if current_app.config.get('ENTITY_MULTIPLE_LOCALE', False):
-            #     params['locale_available'] = _locale or g.language
-            #     _locale = None
-            # else:
-            #     _locale = _locale or g.language                
-
-        if locale_list:
-            must.append({"terms": {"locale.keyword": locale_list}})
-        # elif al := current_app.config.get('AVAILABLE_LOCALE'):
-        #     must.append({"terms": {"locale.keyword": al}})
-
-            # if in_locale:
-            #     must.append({"term": {"locale_available.keyword": in_locale}})
+            if _locale:
+                locales = [_locale] if isinstance(_locale, str) else list(_locale)
+                if locales:
+                    must.append({
+                        "bool": {
+                            "should": [
+                                {
+                                    "bool": {
+                                        "must": [
+                                            {"terms": {"category.keyword": ["page", "collection"]}},
+                                            {"terms": {"locale.keyword": locales}}
+                                        ]
+                                    }
+                                },
+                                {
+                                    "bool": {
+                                        "must": [
+                                            {"terms": {"category.keyword": ["provider", "slot"]}},
+                                            {"terms": {"locale_available.keyword": locales}}
+                                        ]
+                                    }
+                                },
+                                {
+                                    "bool": {
+                                        "must_not": [
+                                            {"terms": {"category.keyword": ["page", "collection", "provider", "slot"]}}
+                                        ],
+                                        "should": [
+                                            {"terms": {"locale.keyword": locales}},
+                                            {"terms": {"locale_available.keyword": locales}}
+                                        ],
+                                        "minimum_should_match": 1
+                                    }
+                                }
+                            ],
+                            "minimum_should_match": 1
+                        }
+                    })
 
         q = {
             "query": {
@@ -1052,11 +1067,18 @@ class Page(ElasticEntity):
         }
 
         logger.debug(f'Search query: {q}')
-        resp = current_app.es.search(index=cls._table(), body=q, request_timeout=60, ignore=[404])
-        logger.debug(f'Search query response: {resp}')
+        try:
+            resp = current_app.es.search(index=cls._table(), body=q, request_timeout=60, ignore=[400, 404])
+        except Exception as e:
+            logger.warning(f'Elasticsearch search error: {e}')
+            return
+
+        if not resp or 'hits' not in resp or 'hits' not in resp['hits']:
+            logger.warning(f'Search query returned invalid response: {resp}')
+            return
 
         if 'status' in resp and resp['status'] in [400, 404]:
-            return []
+            return
 
         for item in resp['hits']['hits']:
             obj = cls(item['_source'], item['_id'])
@@ -1065,7 +1087,7 @@ class Page(ElasticEntity):
 
     @property
     def visit_url(self):
-        return u_func('visit', alias=self.external_id or self.alias)
+        return url_for('visit', alias=self.external_id or self.alias)
 
     @property
     def acceptable(self):

{esentity-0.2.301 → esentity-0.2.303}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "esentity"
-version = "0.2.301"
+version = "0.2.303"
 description = "Elasticsearch Entity Tools"
 authors = ["Slotmarks <info@slotmarks.com>"]
 homepage = "https://slotmarks.com"

{esentity-0.2.301 → esentity-0.2.303}/setup.py

@@ -9,7 +9,7 @@ package_data = \
 
 setup_kwargs = {
     'name': 'esentity',
-    'version': '0.2.301',
+    'version': '0.2.303',
     'description': 'Elasticsearch Entity Tools',
     'long_description': None,
     'author': 'Slotmarks',

esentity-0.2.301/esentity/__init__.py

@@ -1 +0,0 @@
-__version__ = '0.2.301'