+
报告已生成,点击下载
@@ -91,7 +92,7 @@ function ReportScreen({}) {
)}
{query.isError &&
{query.error.message}
}
{mut.isError &&
{mut.error.message}
}
-
+
)
}
diff --git a/client/web/src/index.css b/client/web/src/index.css
index b55d994..cb11880 100644
--- a/client/web/src/index.css
+++ b/client/web/src/index.css
@@ -77,6 +77,6 @@
@layer components {
h2 {
- @apply scroll-m-20 text-2xl font-semibold tracking-tight mb-4;
+ @apply scroll-m-20 text-2xl font-semibold tracking-tight mb-4 text-left;
}
}
From fcae0138b74d4d3e92e06c02c5666739271073b6 Mon Sep 17 00:00:00 2001
From: Lingfei Song <82314+madcat@users.noreply.github.com>
Date: Fri, 12 Apr 2024 11:04:07 +0700
Subject: [PATCH 08/16] page data in utc yyyy-mm-dd, not local date
---
client/Dockerfile.web | 4 +++-
client/pb/pb_hooks/main.pb.js | 2 +-
client/web/src/components/screen/insights.jsx | 6 +++---
client/web/src/lib/utils.js | 5 ++++-
client/web/src/store.js | 15 +++++++++------
5 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/client/Dockerfile.web b/client/Dockerfile.web
index d4ef67d..df59a6b 100644
--- a/client/Dockerfile.web
+++ b/client/Dockerfile.web
@@ -12,7 +12,9 @@ FROM alpine:latest
ARG PB_VERSION=0.21.1
-RUN apk add --no-cache unzip ca-certificates tzdata
+RUN apk add --no-cache unzip ca-certificates tzdata && \
+ ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
# download and unzip PocketBase
ADD https://github.com/pocketbase/pocketbase/releases/download/v${PB_VERSION}/pocketbase_${PB_VERSION}_linux_amd64.zip /tmp/pb.zip
diff --git a/client/pb/pb_hooks/main.pb.js b/client/pb/pb_hooks/main.pb.js
index 44bf76a..7f585e8 100644
--- a/client/pb/pb_hooks/main.pb.js
+++ b/client/pb/pb_hooks/main.pb.js
@@ -43,7 +43,7 @@ routerAdd(
})
)
- $app.dao().db().newQuery("SELECT DISTINCT DATE(created, 'localtime') as created FROM insights").all(result)
+ $app.dao().db().newQuery("SELECT DISTINCT DATE(created) as created FROM insights").all(result)
return c.json(
200,
diff --git a/client/web/src/components/screen/insights.jsx b/client/web/src/components/screen/insights.jsx
index 90da40f..2cbbd8c 100644
--- a/client/web/src/components/screen/insights.jsx
+++ b/client/web/src/components/screen/insights.jsx
@@ -66,11 +66,11 @@ function InsightsScreen({}) {
const [, navigate] = useLocation()
const queryClient = useQueryClient()
const mut = useMutation({
- mutationFn: (data) => {
- if (data && selectInsight && data.find((insight) => insight.id == selectedInsight).expand.articles.length == 1) {
+ mutationFn: (params) => {
+ if (params && selectedInsight && data.find((insight) => insight.id == selectedInsight).expand.articles.length == 1) {
throw new Error("不能删除最后一篇文章")
}
- return unlinkArticle(data)
+ return unlinkArticle(params)
},
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ["insights", currentDate] })
diff --git a/client/web/src/lib/utils.js b/client/web/src/lib/utils.js
index d314d8c..eae5d61 100644
--- a/client/web/src/lib/utils.js
+++ b/client/web/src/lib/utils.js
@@ -1,12 +1,15 @@
import { clsx } from "clsx"
import { twMerge } from "tailwind-merge"
+export const LOCAL_TIME_OFFSITE = "+08:00"
+
export function cn(...inputs) {
return twMerge(clsx(inputs))
}
export function formatDate(date) {
- var d = new Date(isNaN(date) ? date + "T00:00:00" : date)
+ // var d = new Date(isNaN(date) ? date + "T00:00:00" + LOCAL_TIME_OFFSITE : date) // local
+ var d = new Date(isNaN(date) ? date + "T00:00:00" : date) // utc
var iso = d.toISOString()
return iso.slice(0, 10) + " " + iso.slice(11, 23) + "Z"
// return [d.getFullYear(), (d.getMonth() + 1).padLeft(), d.getDate().padLeft()].join("-") + " " + [d.getHours().padLeft(), d.getMinutes().padLeft(), d.getSeconds().padLeft()].join(":") + ".000Z"
diff --git a/client/web/src/store.js b/client/web/src/store.js
index be5fb65..e2c08cf 100644
--- a/client/web/src/store.js
+++ b/client/web/src/store.js
@@ -9,7 +9,7 @@ import { persist } from "zustand/middleware"
import axios from "axios"
import { nanoid } from "nanoid"
-import { formatDate } from "./lib/utils"
+import { formatDate, LOCAL_TIME_OFFSITE } from "./lib/utils"
const DAYS_RANGE = [1, 14]
@@ -211,7 +211,9 @@ export function getArticles(date) {
if (!date) return []
const from = formatDate(date)
- const to = formatDate(new Date(new Date(date).getTime() + 60 * 60 * 24 * 1000))
+ //const to = formatDate(new Date(new Date(date + "T00:00:00" + LOCAL_TIME_OFFSITE).getTime() + 60 * 60 * 24 * 1000))
+ const to = formatDate(new Date(new Date(date + "T00:00:00").getTime() + 60 * 60 * 24 * 1000))
+ console.log("from/to", from, to)
return pb.collection("articles").getFullList({
sort: "-created",
expand: "translation_result",
@@ -224,15 +226,15 @@ export function getInsight(id) {
}
export function getInsights(date) {
- if (!date) return null
+ if (!date) return []
const from = formatDate(date)
+ //const to = formatDate(new Date(new Date(date + "T00:00:00" + LOCAL_TIME_OFFSITE).getTime() + 60 * 60 * 24 * 1000))
const to = formatDate(new Date(new Date(date + "T00:00:00").getTime() + 60 * 60 * 24 * 1000))
// console.log("from/to", from, to)
const f = 'created >= "' + from + '" && created < "' + to + '"'
- console.log(f)
-
+ // console.log(f)
return pb.collection("insights").getFullList({
sort: "-created",
expand: "articles, articles.translation_result",
@@ -250,7 +252,7 @@ export async function getInsightDates() {
Authorization: "Bearer " + pb.authStore?.token,
},
})
- // return data.map((d) => new Date(d + "T00:00:00Z").toLocaleDateString().split("/").join("-"))
+ //return data.map((d) => new Date(d + "T00:00:00" + LOCAL_TIME_OFFSITE).toISOString().slice(0, 10))
return data
}
@@ -263,6 +265,7 @@ export async function getArticleDates() {
Authorization: "Bearer " + pb.authStore?.token,
},
})
+ //return data.map((d) => new Date(d + "T00:00:00" + LOCAL_TIME_OFFSITE).toISOString().slice(0, 10))
return data
}
From 0554e7a72f6654a8abd1893db070286ca7a888ef Mon Sep 17 00:00:00 2001
From: bigbrother666
Date: Tue, 16 Apr 2024 08:05:49 +0800
Subject: [PATCH 09/16] resolve docker yaml
---
client/backend/requirements.txt | 17 -----------------
client/compose.yaml | 1 +
2 files changed, 1 insertion(+), 17 deletions(-)
delete mode 100644 client/backend/requirements.txt
diff --git a/client/backend/requirements.txt b/client/backend/requirements.txt
deleted file mode 100644
index e2148b6..0000000
--- a/client/backend/requirements.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-fastapi
-pydantic
-uvicorn
-dashscope #optional（使用阿里灵积时安装）
-volcengine #optional(使用火山翻译时安装）
-python-docx
-BCEmbedding==0.1.3
-langchain==0.1.0
-langchain-community==0.0.9
-langchain-core==0.1.7
-langsmith==0.0.77
-# faiss-gpu for gpu environment
-faiss-cpu # for cpu-only environment
-pocketbase==0.10.0
-gne
-selenium
-chardet
\ No newline at end of file
diff --git a/client/compose.yaml b/client/compose.yaml
index 88c0a7a..35992da 100644
--- a/client/compose.yaml
+++ b/client/compose.yaml
@@ -19,3 +19,4 @@ services:
volumes:
#- ./${PROJECT_DIR}:/app/${PROJECT_DIR}
- ${EMBEDDING_MODEL_PATH}:${EMBEDDING_MODEL_PATH}
+ - ${RERANKER_MODEL_PATH}:${RERANKER_MODEL_PATH}
From 631f09252771a2957d49794f199993a0905fe595 Mon Sep 17 00:00:00 2001
From: bigbrother666
Date: Tue, 16 Apr 2024 08:08:36 +0800
Subject: [PATCH 10/16] add requirements
---
client/backend/requirements.txt | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 client/backend/requirements.txt
diff --git a/client/backend/requirements.txt b/client/backend/requirements.txt
new file mode 100644
index 0000000..573c9a9
--- /dev/null
+++ b/client/backend/requirements.txt
@@ -0,0 +1,16 @@
+fastapi
+pydantic
+uvicorn
+dashscope #optional（使用阿里灵积时安装）
+volcengine #optional(使用火山翻译时安装）
+python-docx
+BCEmbedding==0.1.3
+langchain==0.1.0
+langchain-community==0.0.9
+langchain-core==0.1.7
+langsmith==0.0.77
+# faiss-gpu for gpu environment
+faiss-cpu # for cpu-only environment
+pocketbase==0.10.0
+gne
+chardet
\ No newline at end of file
From 118e70d7b0a7da7c44aea43ea51f9671b904e122 Mon Sep 17 00:00:00 2001
From: bigbrother666
Date: Tue, 16 Apr 2024 14:33:59 +0800
Subject: [PATCH 11/16] seperate site setting
---
client/.dockerignore | 2 +-
client/.gitignore | 2 +-
client/README.md | 3 ++-
client/backend/background_task.py | 12 ++----------
client/config.ini | 9 +--------
client/sites.txt | 5 +++++
client/version | 2 +-
7 files changed, 13 insertions(+), 22 deletions(-)
create mode 100644 client/sites.txt
diff --git a/client/.dockerignore b/client/.dockerignore
index 4d15359..d420a0f 100644
--- a/client/.dockerignore
+++ b/client/.dockerignore
@@ -11,4 +11,4 @@ docker-compose.yaml
Dockerfile
README.md
backend/__pycache__
-backend/AWtest
\ No newline at end of file
+backend/WStest
\ No newline at end of file
diff --git a/client/.gitignore b/client/.gitignore
index 783ac3b..7394c6a 100644
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -1,4 +1,4 @@
.env
.venv/
pb/pb_data/
-backend/AWtest/
\ No newline at end of file
+backend/WStest/
\ No newline at end of file
diff --git a/client/README.md b/client/README.md
index 19e7c26..c66dead 100644
--- a/client/README.md
+++ b/client/README.md
@@ -18,7 +18,8 @@
- character 以什么身份挖掘线索（这决定了llm的关注点和立场）
- focus 关注什么方面的线索
- focus_type 线索类型
-- good_samples 你希望llm给出的线索描述模式（给两个sample）
+- good_samples1 你希望llm给出的线索描述模式（给两个sample）
+- good_samples2 你希望llm给出的线索描述模式（给两个sample）
- bad_samples 规避的线索描述模式
- report_type 报告类型
diff --git a/client/backend/background_task.py b/client/backend/background_task.py
index 66664ca..62e104e 100644
--- a/client/backend/background_task.py
+++ b/client/backend/background_task.py
@@ -4,21 +4,13 @@
import schedule
import time
from work_process import ServiceProcesser
-import configparser
-
-config = configparser.ConfigParser()
-config.read('../config.ini')
-
-if config.has_section('sites'):
- web_pages = config['sites']
- urls = [value for key, value in web_pages.items()]
-else:
- urls = []
sp = ServiceProcesser()
def task():
+ with open('../sites.txt', 'r', encoding='utf-8') as f:
+ urls = [line.strip() for line in f.readlines() if line.strip()]
sp(sites=urls)
diff --git a/client/config.ini b/client/config.ini
index 80b5c42..f5de78f 100644
--- a/client/config.ini
+++ b/client/config.ini
@@ -6,11 +6,4 @@ focus_type = 网络安全新闻
good_sample1 = 黑客组织Rhysida声称已入侵中国国有能源公司
good_sample2 = 差不多一百万份包含未成年人数据（包括家庭地址和照片）的文件对互联网上的任何人都开放，对孩子构成威胁
bad_sample = 黑客组织活动最近频发
-report_type = 网络安全情报
-
-[sites]
-site3 = https://www.hackread.com/
-site2 = http://sh.people.com.cn/
-site1 = https://www.xuexi.cn/
-site4 = https://www.defensenews.com/
-site5 = https://www.meritalk.com
\ No newline at end of file
+report_type = 网络安全情报
\ No newline at end of file
diff --git a/client/sites.txt b/client/sites.txt
new file mode 100644
index 0000000..c4c5eba
--- /dev/null
+++ b/client/sites.txt
@@ -0,0 +1,5 @@
+https://www.hackread.com/
+http://sh.people.com.cn/
+https://www.xuexi.cn/
+https://www.defensenews.com/
+https://www.meritalk.com
\ No newline at end of file
diff --git a/client/version b/client/version
index 1474d00..22c08f7 100644
--- a/client/version
+++ b/client/version
@@ -1 +1 @@
-v0.2.0
+v0.2.1
From 1226e2d70a6bea2996d65fab5a5ae278919a7ba0 Mon Sep 17 00:00:00 2001
From: bigbrother666
Date: Tue, 16 Apr 2024 14:42:54 +0800
Subject: [PATCH 12/16] update manuel
---
client/README.md | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/client/README.md b/client/README.md
index c66dead..18e2dd2 100644
--- a/client/README.md
+++ b/client/README.md
@@ -23,12 +23,16 @@
- bad_samples 规避的线索描述模式
- report_type 报告类型
-- 【sites] 大类下面列出你的信源。一行一个网址。
+### 4、编辑 sites.txt 文件
+
+这个文件指定了需要本地执行的监控的信源，一行一个网址，支持随时更改，每次执行任务前会读取最新的。
如果你只爬取配置了专有爬虫的信源的话，可以直接编辑scrapers/__init__.py 中的scraper_map，这里都留空就好
专有爬虫的说明见 backend/scrapers/README.md
+**注：虽然wiseflow client配置了通用爬虫，对于新闻类静态网页有一定的爬取和解析效果，但我们还是强烈建议使用我们的数据订阅服务或者自写专业爬虫。**
+
## 参考：各服务注册地址
- 阿里灵积大模型接口：https://dashscope.aliyun.com/
From ac021d9ee0653a346f5c060efe1e591e2f286b3a Mon Sep 17 00:00:00 2001
From: bigbrother666
Date: Tue, 16 Apr 2024 23:07:03 +0800
Subject: [PATCH 13/16] update docker
---
client/Dockerfile.api | 8 ++++----
client/compose.yaml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/client/Dockerfile.api b/client/Dockerfile.api
index 6e10a9b..01cf413 100644
--- a/client/Dockerfile.api
+++ b/client/Dockerfile.api
@@ -1,16 +1,16 @@
FROM python:3.10-slim
RUN apt-get update && \
- apt-get install -yq tzdata && \
- ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
- dpkg-reconfigure -f noninteractive tzdata
+ apt-get install -yq tzdata build-essential
+
+RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
WORKDIR /app
COPY backend/requirements.txt requirements.txt
RUN pip install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple
-COPY backend ./
+COPY backend .
EXPOSE 7777
CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7777"]
\ No newline at end of file
diff --git a/client/compose.yaml b/client/compose.yaml
index 35992da..44f7ede 100644
--- a/client/compose.yaml
+++ b/client/compose.yaml
@@ -17,6 +17,6 @@ services:
ports:
- 7777:7777
volumes:
- #- ./${PROJECT_DIR}:/app/${PROJECT_DIR}
+ - ./${PROJECT_DIR}:/app/${PROJECT_DIR}
- ${EMBEDDING_MODEL_PATH}:${EMBEDDING_MODEL_PATH}
- ${RERANKER_MODEL_PATH}:${RERANKER_MODEL_PATH}
From 55b27c8984c02ce59fba63c74c3ca505dc933ead Mon Sep 17 00:00:00 2001
From: bigbrother666
Date: Wed, 17 Apr 2024 14:02:25 +0800
Subject: [PATCH 14/16] use pb for config
---
client/backend/__init__.py | 35 ++---
client/backend/background_task.py | 23 ++-
client/backend/get_insight.py | 50 +++++--
client/backend/get_report.py | 27 +++-
client/backend/pb_api.py | 13 +-
client/backend/scrapers/general_scraper.py | 1 +
client/backend/scrapers/simple_crawler.py | 5 +-
client/backend/work_process.py | 20 ++-
client/config.ini | 9 --
.../1713321985_created_roleplays.js | 135 ++++++++++++++++++
.../pb_migrations/1713322324_created_sites.js | 54 +++++++
.../pb_migrations/1713328405_updated_sites.js | 74 ++++++++++
.../pb_migrations/1713329959_updated_sites.js | 27 ++++
13 files changed, 404 insertions(+), 69 deletions(-)
delete mode 100644 client/config.ini
create mode 100644 client/pb/pb_migrations/1713321985_created_roleplays.js
create mode 100644 client/pb/pb_migrations/1713322324_created_sites.js
create mode 100644 client/pb/pb_migrations/1713328405_updated_sites.js
create mode 100644 client/pb/pb_migrations/1713329959_updated_sites.js
diff --git a/client/backend/__init__.py b/client/backend/__init__.py
index 0e3303c..d0fb691 100644
--- a/client/backend/__init__.py
+++ b/client/backend/__init__.py
@@ -3,7 +3,7 @@ import time
import json
import uuid
from get_logger import get_logger
-from pb_api import PbTalker
+from pb_api import pb
from get_report import get_report
from get_search import search_insight
from tranlsation_volcengine import text_translate
@@ -20,7 +20,6 @@ class BackendService:
# 2. load the llm
# self.llm = LocalLlmWrapper()
- self.pb = PbTalker(self.logger)
self.memory = {}
# self.scholar = Scholar(initial_file_dir=os.path.join(self.project_dir, "files"), use_gpu=use_gpu)
self.logger.info(f'{self.name} init success.')
@@ -33,7 +32,7 @@ class BackendService:
:return: 成功的话返回更新后的insight_id（其实跟原id一样）, 不成功返回空字符
"""
self.logger.debug(f'got new report request insight_id {insight_id}')
- insight = self.pb.read('insights', filter=f'id="{insight_id}"')
+ insight = pb.read('insights', filter=f'id="{insight_id}"')
if not insight:
self.logger.error(f'insight {insight_id} not found')
return self.build_out(-2, 'insight not found')
@@ -43,8 +42,7 @@ class BackendService:
self.logger.error(f'insight {insight_id} has no articles')
return self.build_out(-2, 'can not find articles for insight')
- article_list = [self.pb.read('articles',
- fields=['title', 'abstract', 'content', 'url', 'publish_time'], filter=f'id="{_id}"')
+ article_list = [pb.read('articles', fields=['title', 'abstract', 'content', 'url', 'publish_time'], filter=f'id="{_id}"')
for _id in article_ids]
article_list = [_article[0] for _article in article_list if _article]
@@ -66,7 +64,7 @@ class BackendService:
if flag:
file = open(docx_file, 'rb')
- message = self.pb.upload('insights', insight_id, 'docx', f'{insight_id}.docx', file)
+ message = pb.upload('insights', insight_id, 'docx', f'{insight_id}.docx', file)
file.close()
if message:
self.logger.debug(f'report success finish and update to pb-{message}')
@@ -96,8 +94,7 @@ class BackendService:
en_texts = []
k = 1
for article_id in article_ids:
- raw_article = self.pb.read(collection_name='articles', fields=['abstract', 'title', 'translation_result'],
- filter=f'id="{article_id}"')
+ raw_article = pb.read(collection_name='articles', fields=['abstract', 'title', 'translation_result'], filter=f'id="{article_id}"')
if not raw_article or not raw_article[0]:
self.logger.warning(f'get article {article_id} failed, skipping')
flag = -2
@@ -118,14 +115,11 @@ class BackendService:
translate_result = text_translate(en_texts, logger=self.logger)
if translate_result and len(translate_result) == 2*len(key_cache):
for i in range(0, len(translate_result), 2):
- related_id = self.pb.add(collection_name='article_translation',
- body={'title': translate_result[i], 'abstract': translate_result[i+1],
- 'raw': key_cache[int(i/2)]})
+ related_id = pb.add(collection_name='article_translation', body={'title': translate_result[i], 'abstract': translate_result[i+1], 'raw': key_cache[int(i/2)]})
if not related_id:
self.logger.warning(f'write article_translation {key_cache[int(i/2)]} failed')
else:
- _ = self.pb.update(collection_name='articles', id=key_cache[int(i/2)],
- body={'translation_result': related_id})
+ _ = pb.update(collection_name='articles', id=key_cache[int(i/2)], body={'translation_result': related_id})
if not _:
self.logger.warning(f'update article {key_cache[int(i/2)]} failed')
self.logger.debug('done')
@@ -148,14 +142,11 @@ class BackendService:
translate_result = text_translate(en_texts, logger=self.logger)
if translate_result and len(translate_result) == 2*len(key_cache):
for i in range(0, len(translate_result), 2):
- related_id = self.pb.add(collection_name='article_translation',
- body={'title': translate_result[i], 'abstract': translate_result[i+1],
- 'raw': key_cache[int(i/2)]})
+ related_id = pb.add(collection_name='article_translation', body={'title': translate_result[i], 'abstract': translate_result[i+1], 'raw': key_cache[int(i/2)]})
if not related_id:
self.logger.warning(f'write article_translation {key_cache[int(i/2)]} failed')
else:
- _ = self.pb.update(collection_name='articles', id=key_cache[int(i/2)],
- body={'translation_result': related_id})
+ _ = pb.update(collection_name='articles', id=key_cache[int(i/2)], body={'translation_result': related_id})
if not _:
self.logger.warning(f'update article {key_cache[int(i/2)]} failed')
self.logger.debug('done')
@@ -172,14 +163,14 @@ class BackendService:
:return: 成功的话返回更新后的insight_id（其实跟原id一样）, 不成功返回空字符
"""
self.logger.debug(f'got search request for insight： {insight_id}')
- insight = self.pb.read('insights', filter=f'id="{insight_id}"')
+ insight = pb.read('insights', filter=f'id="{insight_id}"')
if not insight:
self.logger.error(f'insight {insight_id} not found')
return self.build_out(-2, 'insight not found')
article_ids = insight[0]['articles']
if article_ids:
- article_list = [self.pb.read('articles', fields=['url'], filter=f'id="{_id}"') for _id in article_ids]
+ article_list = [pb.read('articles', fields=['url'], filter=f'id="{_id}"') for _id in article_ids]
url_list = [_article[0]['url'] for _article in article_list if _article]
else:
url_list = []
@@ -190,7 +181,7 @@ class BackendService:
return self.build_out(flag, 'search engine error or no result')
for item in search_result:
- new_article_id = self.pb.add(collection_name='articles', body=item)
+ new_article_id = pb.add(collection_name='articles', body=item)
if new_article_id:
article_ids.append(new_article_id)
else:
@@ -198,7 +189,7 @@ class BackendService:
with open(os.path.join(self.cache_url, 'cache_articles.json'), 'a', encoding='utf-8') as f:
json.dump(item, f, ensure_ascii=False, indent=4)
- message = self.pb.update(collection_name='insights', id=insight_id, body={'articles': article_ids})
+ message = pb.update(collection_name='insights', id=insight_id, body={'articles': article_ids})
if message:
self.logger.debug(f'insight search success finish and update to pb-{message}')
return self.build_out(11, insight_id)
diff --git a/client/backend/background_task.py b/client/backend/background_task.py
index 62e104e..26281c1 100644
--- a/client/backend/background_task.py
+++ b/client/backend/background_task.py
@@ -4,18 +4,31 @@
import schedule
import time
from work_process import ServiceProcesser
+from pb_api import pb
sp = ServiceProcesser()
+counter = 0
+# 每小时唤醒一次，如果pb的sites表中有信源，会挑取符合周期的信源执行，没有没有的话，则每24小时执行专有爬虫一次
def task():
- with open('../sites.txt', 'r', encoding='utf-8') as f:
- urls = [line.strip() for line in f.readlines() if line.strip()]
- sp(sites=urls)
+ global counter
+ sites = pb.read('sites', filter='activated=True')
+ urls = []
+ for site in sites:
+ if not site['per_hours'] or not site['url']:
+ continue
+ if counter % site['per_hours'] == 0:
+ urls.append(site['url'])
+ counter += 1
+ if urls:
+ sp(sites=urls)
+ else:
+ if counter % 24 == 0:
+ sp()
-# 每天凌晨1点运行任务
-schedule.every().day.at("01:17").do(task)
+schedule.every().hour.do(task)
while True:
schedule.run_pending()
diff --git a/client/backend/get_insight.py b/client/backend/get_insight.py
index df2aefc..fa5e667 100644
--- a/client/backend/get_insight.py
+++ b/client/backend/get_insight.py
@@ -8,37 +8,63 @@ from general_utils import isChinesePunctuation, is_chinese
from tranlsation_volcengine import text_translate
import time
import re
-import configparser
+from pb_api import pb
+
max_tokens = 4000
relation_theshold = 0.525
-config = configparser.ConfigParser()
-config.read('../config.ini')
+role_config = pb.read(collection_name='roleplays', filter=f'activated=True')
+_role_config_id = ''
+if role_config:
+ character = role_config[0]['character']
+ focus = role_config[0]['focus']
+ focus_type = role_config[0]['focus_type']
+ good_sample1 = role_config[0]['good_sample1']
+ good_sample2 = role_config[0]['good_sample2']
+ bad_sample = role_config[0]['bad_sample']
+ _role_config_id = role_config[0]['id']
+else:
+ character, good_sample1, focus, focus_type, good_sample2, bad_sample = '', '', '', '', '', ''
+
+if not character:
+ character = input('请为首席情报官指定角色设定（eg. 来自中国的网络安全情报专家）：\n')
+ _role_config_id = pb.add(collection_name='roleplays', body={'character': character, 'activated': True})
+
+if not _role_config_id:
+ raise Exception('pls check pb data, 无法获取角色设定')
+
+if not (focus and focus_type and good_sample1 and good_sample2 and bad_sample):
+ focus = input('请为首席情报官指定关注点（eg. 中国关注的网络安全新闻）：\n')
+ focus_type = input('请为首席情报官指定关注点类型（eg. 网络安全新闻）：\n')
+ good_sample1 = input('请给出一个你期望的情报描述示例（eg. 黑客组织Rhysida声称已入侵中国国有能源公司）: \n')
+ good_sample2 = input('请再给出一个理想示例（eg. 差不多一百万份包含未成年人数据（包括家庭地址和照片）的文件对互联网上的任何人都开放，对孩子构成威胁）: \n')
+ bad_sample = input('请给出一个你不期望的情报描述示例（eg. 黑客组织活动最近频发）: \n')
+ _ = pb.update(collection_name='roleplays', id=_role_config_id, body={'focus': focus, 'focus_type': focus_type, 'good_sample1': good_sample1, 'good_sample2': good_sample2, 'bad_sample': bad_sample})
# 实践证明，如果强调让llm挖掘我国值得关注的线索，则挖掘效果不好（容易被新闻内容误导，错把别的国家当成我国，可能这时新闻内有我国这样的表述）
# step by step 如果是内心独白方式，输出格式包含两种，难度增加了，qwen-max不能很好的适应，也许可以改成两步，第一步先输出线索列表，第二步再会去找对应的新闻编号
# 但从实践来看，这样做的性价比并不高，且会引入新的不确定性。
-_first_stage_prompt = f'''你是一名{config['prompts']['character']}，你将被给到一个新闻列表，新闻文章用XML标签分隔。请对此进行分析，挖掘出特别值得{config['prompts']['focus']}线索。你给出的线索应该足够具体，而不是同类型新闻的归类描述，好的例子如：
-"""{config['prompts']['good_sample1']}"""
+_first_stage_prompt = f'''你是一名{character}，你将被给到一个新闻列表，新闻文章用XML标签分隔。请对此进行分析，挖掘出特别值得{focus}线索。你给出的线索应该足够具体，而不是同类型新闻的归类描述，好的例子如：
+"""{good_sample1}"""
不好的例子如：
-"""{config['prompts']['bad_sample']}"""
+"""{bad_sample}"""
请从头到尾仔细阅读每一条新闻的内容，不要遗漏，然后列出值得关注的线索，每条线索都用一句话进行描述，最终按一条一行的格式输出，并整体用三引号包裹，如下所示：
"""
-{config['prompts']['good_sample1']}
-{config['prompts']['good_sample2']}
+{good_sample1}
+{good_sample2}
"""
不管新闻列表是何种语言，请仅用中文输出分析结果。'''
-_rewrite_insight_prompt = f'''你是一名{config['prompts']['character']}，你将被给到一个新闻列表，新闻文章用 XML 标签分隔。请对此进行分析，从中挖掘出一条最值得关注的{config['prompts']['focus_type']}线索。你给出的线索应该足够具体，而不是同类型新闻的归类描述，好的例子如：
-"""{config['prompts']['good_sample1']}"""
+_rewrite_insight_prompt = f'''你是一名{character}，你将被给到一个新闻列表，新闻文章用XML标签分隔。请对此进行分析，从中挖掘出一条最值得关注的{focus_type}线索。你给出的线索应该足够具体，而不是同类型新闻的归类描述，好的例子如：
+"""{good_sample1}"""
不好的例子如：
-"""{config['prompts']['bad_sample']}"""
+"""{bad_sample}"""
请保证只输出一条最值得关注的线索，线索请用一句话描述，并用三引号包裹输出，如下所示：
-"""{config['prompts']['good_sample1']}"""
+"""{good_sample1}"""
不管新闻列表是何种语言，请仅用中文输出分析结果。'''
diff --git a/client/backend/get_report.py b/client/backend/get_report.py
index 334ba20..90242cd 100644
--- a/client/backend/get_report.py
+++ b/client/backend/get_report.py
@@ -7,14 +7,31 @@ from docx.shared import Pt, RGBColor
from docx.enum.text import WD_PARAGRAPH_ALIGNMENT
from datetime import datetime
from general_utils import isChinesePunctuation
-import configparser
+from pb_api import pb
# qwen-72b-chat支持最大30k输入，考虑prompt其他部分，content不应超过30000字符长度
# 如果换qwen-max（最大输入6k),这里就要换成6000,但这样很多文章不能分析了
# 本地部署模型（qwen-14b这里可能仅支持4k输入，可能根本这套模式就行不通）
max_input_tokens = 30000
-config = configparser.ConfigParser()
-config.read('../config.ini')
+role_config = pb.read(collection_name='roleplays', filter=f'activated=True')
+_role_config_id = ''
+if role_config:
+ character = role_config[0]['character']
+ report_type = role_config[0]['report_type']
+ _role_config_id = role_config[0]['id']
+else:
+ character, report_type = '', ''
+
+if not character:
+ character = input('请为首席情报官指定角色设定（eg. 来自中国的网络安全情报专家）：\n')
+ _role_config_id = pb.add(collection_name='roleplays', body={'character': character, 'activated': True})
+
+if not _role_config_id:
+ raise Exception('pls check pb data无法获取角色设定')
+
+if not report_type:
+ report_type = input('请为首席情报官指定报告类型（eg. 网络安全情报）：\n')
+ _ = pb.update(collection_name='roleplays', id=_role_config_id, body={'report_type': report_type})
def get_report(insigt: str, articles: list[dict], memory: str, topics: list[str], comment: str, docx_file: str, logger=None) -> (bool, str):
@@ -44,7 +61,7 @@ def get_report(insigt: str, articles: list[dict], memory: str, topics: list[str]
paragraphs = re.findall("、(.*?)】", memory)
if set(topics) <= set(paragraphs):
logger.debug("no change in Topics, need modified the report")
- system_prompt = f'''你是一名{config['prompts']['character']}，你近日向上级提交了一份{config['prompts']['report_type']}报告，如下是报告原文。接下来你将收到来自上级部门的修改意见，请据此修改你的报告：
+ system_prompt = f'''你是一名{character}，你近日向上级提交了一份{report_type}报告，如下是报告原文。接下来你将收到来自上级部门的修改意见，请据此修改你的报告：
报告原文：
"""{memory}"""
'''
@@ -66,7 +83,7 @@ def get_report(insigt: str, articles: list[dict], memory: str, topics: list[str]
break
logger.debug(f"articles context length: {len(texts)}")
- system_prompt = f'''你是一名{config['prompts']['character']}，在近期的工作中我们从所关注的网站中发现了一条重要的{config['prompts']['report_type']}线索，线索和相关文章（用XML标签分隔）如下：
+ system_prompt = f'''你是一名{character}，在近期的工作中我们从所关注的网站中发现了一条重要的{report_type}线索，线索和相关文章（用XML标签分隔）如下：
情报线索： """{insigt} """
相关文章：
{texts}
diff --git a/client/backend/pb_api.py b/client/backend/pb_api.py
index bd5d818..981ddc3 100644
--- a/client/backend/pb_api.py
+++ b/client/backend/pb_api.py
@@ -2,11 +2,15 @@ import os
from pocketbase import PocketBase # Client also works the same
from pocketbase.client import FileUpload
from typing import BinaryIO
+from get_logger import get_logger
class PbTalker:
- def __init__(self, logger=None) -> None:
- self.logger = logger
+ def __init__(self) -> None:
+ self.project_dir = os.environ.get("PROJECT_DIR", "")
+ # 1. base initialization
+ os.makedirs(self.project_dir, exist_ok=True)
+ self.logger = get_logger(name='pb_talker', file=os.path.join(self.project_dir, 'pb_talker.log'))
url = f"http://{os.environ.get('PB_API_BASE', '127.0.0.1:8090')}"
self.logger.debug(f"initializing pocketbase client: {url}")
self.client = PocketBase(url)
@@ -17,7 +21,7 @@ class PbTalker:
email, password = auth.split('|')
_ = self.client.admins.auth_with_password(email, password)
if _:
- self.logger.info(f"pocketbase ready authenticated as admin - {url}")
+ self.logger.info(f"pocketbase ready authenticated as admin - {email}")
else:
raise Exception(f"pocketbase auth failed")
@@ -78,3 +82,6 @@ class PbTalker:
self.logger.error(f"pocketbase update failed: {e}")
return ''
return res.id
+
+
+pb = PbTalker()
diff --git a/client/backend/scrapers/general_scraper.py b/client/backend/scrapers/general_scraper.py
index e693ec7..9fc226d 100644
--- a/client/backend/scrapers/general_scraper.py
+++ b/client/backend/scrapers/general_scraper.py
@@ -17,6 +17,7 @@ import os
header = {
'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/604.1 Edg/112.0.100.0'}
project_dir = os.environ.get("PROJECT_DIR", "")
+os.makedirs(project_dir, exist_ok=True)
logger = get_logger(name='general_scraper', file=os.path.join(project_dir, f'general_scraper.log'))
diff --git a/client/backend/scrapers/simple_crawler.py b/client/backend/scrapers/simple_crawler.py
index 94f3785..60891bf 100644
--- a/client/backend/scrapers/simple_crawler.py
+++ b/client/backend/scrapers/simple_crawler.py
@@ -13,6 +13,7 @@ header = {
'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/604.1 Edg/112.0.100.0'}
project_dir = os.environ.get("PROJECT_DIR", "")
+os.makedirs(project_dir, exist_ok=True)
logger = get_logger(name='simple_crawler', file=os.path.join(project_dir, f'simple_crawler.log'))
@@ -26,11 +27,11 @@ def simple_crawler(url: str | Path) -> (int, dict):
rawdata = response.content
encoding = chardet.detect(rawdata)['encoding']
text = rawdata.decode(encoding)
+ result = extractor.extract(text)
except Exception as e:
- logger.error(e)
+ logger.warning(f"cannot get content from {url}\n{e}")
return -7, {}
- result = extractor.extract(text)
if not result:
logger.error(f"gne cannot extract {url}")
return 0, {}
diff --git a/client/backend/work_process.py b/client/backend/work_process.py
index 05ccae1..f51dbc1 100644
--- a/client/backend/work_process.py
+++ b/client/backend/work_process.py
@@ -5,7 +5,7 @@ from get_logger import get_logger
from datetime import datetime, timedelta, date
from scrapers import scraper_map
from scrapers.general_scraper import general_scraper
-from pb_api import PbTalker
+from pb_api import pb
from urllib.parse import urlparse
from get_insight import get_insight
from general_utils import is_chinese
@@ -27,7 +27,6 @@ class ServiceProcesser:
self.cache_url = os.path.join(self.project_dir, name)
os.makedirs(self.cache_url, exist_ok=True)
self.logger = get_logger(name=self.name, file=os.path.join(self.project_dir, f'{self.name}.log'))
- self.pb = PbTalker(self.logger)
# 2. load the llm
# self.llm = LocalLlmWrapper() # if you use the local-llm
@@ -49,7 +48,7 @@ class ServiceProcesser:
self.logger.debug(f'clear cache -- {cache}')
# 从pb数据库中读取所有文章url
# 这里publish_time用int格式，综合考虑下这个是最容易操作的模式，虽然糙了点
- existing_articles = self.pb.read(collection_name='articles', fields=['id', 'title', 'url'], filter=f'publish_time>{expiration_str}')
+ existing_articles = pb.read(collection_name='articles', fields=['id', 'title', 'url'], filter=f'publish_time>{expiration_str}')
all_title = {}
existings = []
for article in existing_articles:
@@ -84,7 +83,7 @@ class ServiceProcesser:
value['content'] = f"({from_site} 报道){value['content']}"
value['images'] = json.dumps(value['images'])
- article_id = self.pb.add(collection_name='articles', body=value)
+ article_id = pb.add(collection_name='articles', body=value)
if article_id:
cache[article_id] = value
@@ -104,13 +103,13 @@ class ServiceProcesser:
for insight in new_insights:
if not insight['content']:
continue
- insight_id = self.pb.add(collection_name='insights', body=insight)
+ insight_id = pb.add(collection_name='insights', body=insight)
if not insight_id:
self.logger.warning(f'write insight {insight} to pb failed, writing to cache_file')
with open(os.path.join(self.cache_url, 'cache_insights.json'), 'a', encoding='utf-8') as f:
json.dump(insight, f, ensure_ascii=False, indent=4)
for article_id in insight['articles']:
- raw_article = self.pb.read(collection_name='articles', fields=['abstract', 'title', 'translation_result'], filter=f'id="{article_id}"')
+ raw_article = pb.read(collection_name='articles', fields=['abstract', 'title', 'translation_result'], filter=f'id="{article_id}"')
if not raw_article or not raw_article[0]:
self.logger.warning(f'get article {article_id} failed, skipping')
continue
@@ -120,11 +119,11 @@ class ServiceProcesser:
continue
translate_text = text_translate([raw_article[0]['title'], raw_article[0]['abstract']], target_language='zh', logger=self.logger)
if translate_text:
- related_id = self.pb.add(collection_name='article_translation', body={'title': translate_text[0], 'abstract': translate_text[1], 'raw': article_id})
+ related_id = pb.add(collection_name='article_translation', body={'title': translate_text[0], 'abstract': translate_text[1], 'raw': article_id})
if not related_id:
self.logger.warning(f'write article_translation {article_id} failed')
else:
- _ = self.pb.update(collection_name='articles', id=article_id, body={'translation_result': related_id})
+ _ = pb.update(collection_name='articles', id=article_id, body={'translation_result': related_id})
if not _:
self.logger.warning(f'update article {article_id} failed')
else:
@@ -140,8 +139,7 @@ class ServiceProcesser:
else:
text_for_insight = text_translate([value['title']], logger=self.logger)
if text_for_insight:
- insight_id = self.pb.add(collection_name='insights',
- body={'content': text_for_insight[0], 'articles': [key]})
+ insight_id = pb.add(collection_name='insights', body={'content': text_for_insight[0], 'articles': [key]})
if not insight_id:
self.logger.warning(f'write insight {text_for_insight[0]} to pb failed, writing to cache_file')
with open(os.path.join(self.cache_url, 'cache_insights.json'), 'a',
@@ -158,7 +156,7 @@ class ServiceProcesser:
try:
snapshot = requests.get(f"{self.snap_short_server}/zip", {'url': value['url']}, timeout=60)
file = open(snapshot.text, 'rb')
- _ = self.pb.upload('articles', key, 'snapshot', key, file)
+ _ = pb.upload('articles', key, 'snapshot', key, file)
file.close()
except Exception as e:
self.logger.warning(f'error when snapshot {value["url"]}, {e}')
diff --git a/client/config.ini b/client/config.ini
deleted file mode 100644
index f5de78f..0000000
--- a/client/config.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-; config.ini
-[prompts]
-character = 来自中国的网络安全情报专家
-focus = 中国关注的网络安全新闻
-focus_type = 网络安全新闻
-good_sample1 = 黑客组织Rhysida声称已入侵中国国有能源公司
-good_sample2 = 差不多一百万份包含未成年人数据（包括家庭地址和照片）的文件对互联网上的任何人都开放，对孩子构成威胁
-bad_sample = 黑客组织活动最近频发
-report_type = 网络安全情报
\ No newline at end of file
diff --git a/client/pb/pb_migrations/1713321985_created_roleplays.js b/client/pb/pb_migrations/1713321985_created_roleplays.js
new file mode 100644
index 0000000..629a740
--- /dev/null
+++ b/client/pb/pb_migrations/1713321985_created_roleplays.js
@@ -0,0 +1,135 @@
+///
+migrate((db) => {
+ const collection = new Collection({
+ "id": "4rpge043645sp4j",
+ "created": "2024-04-17 02:46:25.373Z",
+ "updated": "2024-04-17 02:46:25.373Z",
+ "name": "roleplays",
+ "type": "base",
+ "system": false,
+ "schema": [
+ {
+ "system": false,
+ "id": "ixk4pwsb",
+ "name": "activated",
+ "type": "bool",
+ "required": false,
+ "presentable": false,
+ "unique": false,
+ "options": {}
+ },
+ {
+ "system": false,
+ "id": "tmak73c7",
+ "name": "character",
+ "type": "text",
+ "required": false,
+ "presentable": false,
+ "unique": false,
+ "options": {
+ "min": null,
+ "max": null,
+ "pattern": ""
+ }
+ },
+ {
+ "system": false,
+ "id": "6iuxuwhb",
+ "name": "focus",
+ "type": "text",
+ "required": false,
+ "presentable": false,
+ "unique": false,
+ "options": {
+ "min": null,
+ "max": null,
+ "pattern": ""
+ }
+ },
+ {
+ "system": false,
+ "id": "axmc2huy",
+ "name": "focus_type",
+ "type": "text",
+ "required": false,
+ "presentable": false,
+ "unique": false,
+ "options": {
+ "min": null,
+ "max": null,
+ "pattern": ""
+ }
+ },
+ {
+ "system": false,
+ "id": "gop61pjt",
+ "name": "good_sample1",
+ "type": "text",
+ "required": false,
+ "presentable": false,
+ "unique": false,
+ "options": {
+ "min": null,
+ "max": null,
+ "pattern": ""
+ }
+ },
+ {
+ "system": false,
+ "id": "qmy5cofa",
+ "name": "good_sample2",
+ "type": "text",
+ "required": false,
+ "presentable": false,
+ "unique": false,
+ "options": {
+ "min": null,
+ "max": null,
+ "pattern": ""
+ }
+ },
+ {
+ "system": false,
+ "id": "h8gafaci",
+ "name": "bad_sample",
+ "type": "text",
+ "required": false,
+ "presentable": false,
+ "unique": false,
+ "options": {
+ "min": null,
+ "max": null,
+ "pattern": ""
+ }
+ },
+ {
+ "system": false,
+ "id": "m2ug5sfd",
+ "name": "report_type",
+ "type": "text",
+ "required": false,
+ "presentable": false,
+ "unique": false,
+ "options": {
+ "min": null,
+ "max": null,
+ "pattern": ""
+ }
+ }
+ ],
+ "indexes": [],
+ "listRule": null,
+ "viewRule": null,
+ "createRule": null,
+ "updateRule": null,
+ "deleteRule": null,
+ "options": {}
+ });
+
+ return Dao(db).saveCollection(collection);
+}, (db) => {
+ const dao = new Dao(db);
+ const collection = dao.findCollectionByNameOrId("4rpge043645sp4j");
+
+ return dao.deleteCollection(collection);
+})
diff --git a/client/pb/pb_migrations/1713322324_created_sites.js b/client/pb/pb_migrations/1713322324_created_sites.js
new file mode 100644
index 0000000..2672a1b
--- /dev/null
+++ b/client/pb/pb_migrations/1713322324_created_sites.js
@@ -0,0 +1,54 @@
+///
+migrate((db) => {
+ const collection = new Collection({
+ "id": "sma08jpi5rkoxnh",
+ "created": "2024-04-17 02:52:04.291Z",
+ "updated": "2024-04-17 02:52:04.291Z",
+ "name": "sites",
+ "type": "base",
+ "system": false,
+ "schema": [
+ {
+ "system": false,
+ "id": "6qo4l7og",
+ "name": "url",
+ "type": "url",
+ "required": false,
+ "presentable": false,
+ "unique": false,
+ "options": {
+ "exceptDomains": null,
+ "onlyDomains": null
+ }
+ },
+ {
+ "system": false,
+ "id": "lgr1quwi",
+ "name": "per_hours",
+ "type": "number",
+ "required": false,
+ "presentable": false,
+ "unique": false,
+ "options": {
+ "min": 1,
+ "max": 24,
+ "noDecimal": false
+ }
+ }
+ ],
+ "indexes": [],
+ "listRule": null,
+ "viewRule": null,
+ "createRule": null,
+ "updateRule": null,
+ "deleteRule": null,
+ "options": {}
+ });
+
+ return Dao(db).saveCollection(collection);
+}, (db) => {
+ const dao = new Dao(db);
+ const collection = dao.findCollectionByNameOrId("sma08jpi5rkoxnh");
+
+ return dao.deleteCollection(collection);
+})
diff --git a/client/pb/pb_migrations/1713328405_updated_sites.js b/client/pb/pb_migrations/1713328405_updated_sites.js
new file mode 100644
index 0000000..f1f8417
--- /dev/null
+++ b/client/pb/pb_migrations/1713328405_updated_sites.js
@@ -0,0 +1,74 @@
+///
+migrate((db) => {
+ const dao = new Dao(db)
+ const collection = dao.findCollectionByNameOrId("sma08jpi5rkoxnh")
+
+ // update
+ collection.schema.addField(new SchemaField({
+ "system": false,
+ "id": "6qo4l7og",
+ "name": "url",
+ "type": "url",
+ "required": true,
+ "presentable": false,
+ "unique": false,
+ "options": {
+ "exceptDomains": null,
+ "onlyDomains": null
+ }
+ }))
+
+ // update
+ collection.schema.addField(new SchemaField({
+ "system": false,
+ "id": "lgr1quwi",
+ "name": "per_hours",
+ "type": "number",
+ "required": true,
+ "presentable": false,
+ "unique": false,
+ "options": {
+ "min": 1,
+ "max": 24,
+ "noDecimal": false
+ }
+ }))
+
+ return dao.saveCollection(collection)
+}, (db) => {
+ const dao = new Dao(db)
+ const collection = dao.findCollectionByNameOrId("sma08jpi5rkoxnh")
+
+ // update
+ collection.schema.addField(new SchemaField({
+ "system": false,
+ "id": "6qo4l7og",
+ "name": "url",
+ "type": "url",
+ "required": false,
+ "presentable": false,
+ "unique": false,
+ "options": {
+ "exceptDomains": null,
+ "onlyDomains": null
+ }
+ }))
+
+ // update
+ collection.schema.addField(new SchemaField({
+ "system": false,
+ "id": "lgr1quwi",
+ "name": "per_hours",
+ "type": "number",
+ "required": false,
+ "presentable": false,
+ "unique": false,
+ "options": {
+ "min": 1,
+ "max": 24,
+ "noDecimal": false
+ }
+ }))
+
+ return dao.saveCollection(collection)
+})
diff --git a/client/pb/pb_migrations/1713329959_updated_sites.js b/client/pb/pb_migrations/1713329959_updated_sites.js
new file mode 100644
index 0000000..a49e806
--- /dev/null
+++ b/client/pb/pb_migrations/1713329959_updated_sites.js
@@ -0,0 +1,27 @@
+///
+migrate((db) => {
+ const dao = new Dao(db)
+ const collection = dao.findCollectionByNameOrId("sma08jpi5rkoxnh")
+
+ // add
+ collection.schema.addField(new SchemaField({
+ "system": false,
+ "id": "8x8n2a47",
+ "name": "activated",
+ "type": "bool",
+ "required": false,
+ "presentable": false,
+ "unique": false,
+ "options": {}
+ }))
+
+ return dao.saveCollection(collection)
+}, (db) => {
+ const dao = new Dao(db)
+ const collection = dao.findCollectionByNameOrId("sma08jpi5rkoxnh")
+
+ // remove
+ collection.schema.removeField("8x8n2a47")
+
+ return dao.saveCollection(collection)
+})
From 7349d6fa3aeea985c94de41111c1b4344881d210 Mon Sep 17 00:00:00 2001
From: bigbrother666
Date: Wed, 17 Apr 2024 18:28:10 +0800
Subject: [PATCH 15/16] improve sth
---
asset/371709012494.jpg | Bin 91693 -> 0 bytes
client/backend/background_task.py | 4 +++-
client/backend/get_insight.py | 12 ++++++------
client/backend/get_report.py | 4 ++--
client/backend/scrapers/simple_crawler.py | 2 +-
client/sites.txt | 5 -----
6 files changed, 12 insertions(+), 15 deletions(-)
delete mode 100644 asset/371709012494.jpg
delete mode 100644 client/sites.txt
diff --git a/asset/371709012494.jpg b/asset/371709012494.jpg
deleted file mode 100644
index b4d58f50f7d9460b8cd565ccb4e11f450f5e1572..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 91693
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�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