Deploy AIOS web (React glide grid + FastAPI slice)
Browse files- RELEASES.json +1 -1
- VERSION +1 -1
- platform/modules/competitor_watch.py +7 -1
- web/public/AIOS_DEPLOY_RECEIPT +1 -1
RELEASES.json
CHANGED
|
@@ -1,4 +1,4 @@
|
|
| 1 |
{
|
| 2 |
-
"current": "
|
| 3 |
"releases": []
|
| 4 |
}
|
|
|
|
| 1 |
{
|
| 2 |
+
"current": "9003f807cb",
|
| 3 |
"releases": []
|
| 4 |
}
|
VERSION
CHANGED
|
@@ -1 +1 @@
|
|
| 1 |
-
|
|
|
|
| 1 |
+
9003f807cb
|
platform/modules/competitor_watch.py
CHANGED
|
@@ -300,7 +300,7 @@ class _TermIndex(_DocumentIndex):
|
|
| 300 |
self.sql("SELECT (value ->> 'activeTotal')::bigint FROM {tbl} WHERE key = %s"))
|
| 301 |
total_params = ([self.slug, *([display_term(search)] if search else [])]
|
| 302 |
if search or tracked else [self.key(KEY_TERM_INDEX)])
|
| 303 |
-
|
| 304 |
"bounds AS (SELECT total, CASE WHEN %s >= total THEN "
|
| 305 |
"greatest(0, floor((total - 1)::numeric / %s)::bigint * %s) ELSE %s END AS skip FROM totals) "
|
| 306 |
"SELECT total, skip, EXISTS(SELECT 1 FROM {terms} WHERE tenant = %s AND term = %s AND " + membership + "), "
|
|
@@ -308,6 +308,12 @@ class _TermIndex(_DocumentIndex):
|
|
| 308 |
+ ("AND strpos(lower(label), %s) > 0 " if search else "") +
|
| 309 |
'ORDER BY ' + order + ' LIMIT %s OFFSET (SELECT skip FROM bounds)) '
|
| 310 |
"FROM bounds")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 311 |
params = [*total_params, offset, limit, limit, offset, self.slug, selected, self.slug,
|
| 312 |
*([display_term(search)] if search else []), limit]
|
| 313 |
with self.connection() as con:
|
|
|
|
| 300 |
self.sql("SELECT (value ->> 'activeTotal')::bigint FROM {tbl} WHERE key = %s"))
|
| 301 |
total_params = ([self.slug, *([display_term(search)] if search else [])]
|
| 302 |
if search or tracked else [self.key(KEY_TERM_INDEX)])
|
| 303 |
+
tail = ("), "
|
| 304 |
"bounds AS (SELECT total, CASE WHEN %s >= total THEN "
|
| 305 |
"greatest(0, floor((total - 1)::numeric / %s)::bigint * %s) ELSE %s END AS skip FROM totals) "
|
| 306 |
"SELECT total, skip, EXISTS(SELECT 1 FROM {terms} WHERE tenant = %s AND term = %s AND " + membership + "), "
|
|
|
|
| 308 |
+ ("AND strpos(lower(label), %s) > 0 " if search else "") +
|
| 309 |
'ORDER BY ' + order + ' LIMIT %s OFFSET (SELECT skip FROM bounds)) '
|
| 310 |
"FROM bounds")
|
| 311 |
+
if isinstance(total, str):
|
| 312 |
+
statement = self.term_sql("WITH totals(total) AS (" + total + tail)
|
| 313 |
+
else:
|
| 314 |
+
# PostgreSQL's `self.sql` returns a psycopg Composed: compose it, never concatenate it as text.
|
| 315 |
+
from psycopg import sql as psql
|
| 316 |
+
statement = psql.SQL("WITH totals(total) AS (") + total + psql.SQL(self.term_sql(tail))
|
| 317 |
params = [*total_params, offset, limit, limit, offset, self.slug, selected, self.slug,
|
| 318 |
*([display_term(search)] if search else []), limit]
|
| 319 |
with self.connection() as con:
|
web/public/AIOS_DEPLOY_RECEIPT
CHANGED
|
@@ -1 +1 @@
|
|
| 1 |
-
|
|
|
|
| 1 |
+
d81a0c64f99d0f7550f41cea233476c915a78a2767cfcffd01343cd5972fbc1a
|