repo
stringlengths
5
53
pr_number
int32
1
321k
task_type
stringclasses
2 values
issue_text
stringlengths
0
81.2k
pr_title
stringlengths
1
319
pr_body
stringlengths
0
105k
base_sha
stringlengths
40
40
head_sha
stringlengths
40
40
gold_diff
stringlengths
0
202M
changed_files
listlengths
0
100
review_threads
listlengths
0
100
test_patch
stringlengths
0
23.4M
merged
bool
1 class
z-song/laravel-admin
5,367
issue_to_patch
Fix PHPDoc
I added some PHPDoc.
cd1179fd5fbdaaf3ce794b995d9c9c14de2f585b
16e65ccdfd843972b1a29fba5bd481cb5fcd91d3
diff --git a/src/Form/Builder.php b/src/Form/Builder.php index fbed5f9398..4ccefa3f9c 100644 --- a/src/Form/Builder.php +++ b/src/Form/Builder.php @@ -106,6 +106,8 @@ class Builder * Builder constructor. * * @param Form $form + * + * @return void */ public function __construct(Form ...
[ "src/Form/Builder.php" ]
[]
true
z-song/laravel-admin
5,358
issue_to_patch
Update CanCascadeFields.php(某些特殊的value值比如:App\Models\User将会导致js元素选择器无法命中该dom元素)
某些特殊的value值比如:App\Models\User将会导致js元素选择器无法命中该dom元素
0ba9c9116178c8c6f2d49cfeed8c819f9a34397e
e2d54f133bbce1e074876078e438bccfd98ab5ca
diff --git a/src/Form/Field/CanCascadeFields.php b/src/Form/Field/CanCascadeFields.php index 17125d147a..b4d3deecbb 100644 --- a/src/Form/Field/CanCascadeFields.php +++ b/src/Form/Field/CanCascadeFields.php @@ -92,7 +92,7 @@ protected function getCascadeClass($value) $value = implode('-', $value); ...
[ "src/Form/Field/CanCascadeFields.php" ]
[]
true
z-song/laravel-admin
5,366
issue_to_patch
Replace 404 link on CONTRIBUTING.md
I found the 404 error link on CONTRIBUTING.md.
52c51ee3b7d7111e74a0f2f64a27539871126ac8
3a191de83e73ae248fd4f6c84297d722d24bf041
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cc17429390..e29c564687 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,7 @@ We welcome any type of contribution, not only code. You can help with ## Your First Contribution -Working on your first Pull Request? You can learn how from this *free* s...
[ "CONTRIBUTING.md" ]
[]
true
zai-org/ChatGLM-6B
1,485
issue_to_patch
GLM-4更新
a0d6b9e1698f5bfd7ca610ebf03a4bd595f53dda
6727b17479ce055b9c6822b1783968f3cfd6b3e3
diff --git a/README.md b/README.md index a68c45c7..9c931fa4 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,34 @@ # ChatGLM-6B <p align="center"> - 🌐 <a href="https://chatglm.cn/blog" target="_blank">Blog</a> • 🤗 <a href="https://huggingface.co/THUDM/chatglm-6b" target="_blank">HF Repo</a> • 🐦 <a href="http...
[ "README.md", "README_en.md" ]
[]
true
zai-org/ChatGLM-6B
117
issue_to_patch
streamlit based web_demo
Add a steamlit based demo web_demo2.py for better UI. Need to install streamlit and streamlit-chat component fisrt: ``` pip install streamlit pip install streamlit-chat ``` then run with the following command: `streamlit run web_demo2.py --server.port 6006`
ecd2857c1a000ff730870b866246cbf06d535c19
905aa26b917755de89008b0c300a2f494738ce85
diff --git a/web_demo2.py b/web_demo2.py new file mode 100644 index 00000000..6946a156 --- /dev/null +++ b/web_demo2.py @@ -0,0 +1,56 @@ +from transformers import AutoModel, AutoTokenizer +import streamlit as st +from streamlit_chat import message + + +st.set_page_config( + page_title="ChatGLM-6b 演示", + page_icon...
[ "web_demo2.py" ]
[]
true
zai-org/ChatGLM-6B
899
issue_to_patch
[Document] 更新Mac部署说明
# 更新Mac部署说明 - Type: Document - FILES: README.md; README_en.md - Keywords: OPENMP; MPS ## 具体更新内容 以[chatglm-6b-int4](https://huggingface.co/THUDM/chatglm-6b-int4)量化模型为例,做如下配置: - 安装libomp的步骤; - 对量化后模型等配置gcc编译项,并启用OMP加速推理; - 量化后模型启用MPS(然后失败)的解释。 Mac 启用OMP涉及`https://huggingface.co/THUDM/chatglm-6b-int4`中...
c95b6b9d0d53c788ce6d16599e3a9ac75ceb1e65
cf0240cfa868107c439113d25247f3599701e388
diff --git a/PROJECT.md b/PROJECT.md index 21733b5f..f27d7e77 100644 --- a/PROJECT.md +++ b/PROJECT.md @@ -20,7 +20,7 @@ 对 ChatGLM-6B 进行微调的开源项目: * [InstructGLM](https://github.com/yanqiangmiffy/InstructGLM):基于ChatGLM-6B进行指令学习,汇总开源中英文指令数据,基于Lora进行指令数据微调,开放了Alpaca、Belle微调后的Lora权重,修复web_demo重复问题 -* [ChatGLM-Efficient-...
[ "PROJECT.md", "README.md", "README_en.md" ]
[]
true
zai-org/ChatGLM-6B
1,095
issue_to_patch
增加 InferLLM 的支持
163f94e160f08751545e3722730f1832d73b92d1
0de717ba9a1be6691ae89739b26ed056907815b2
diff --git a/README.md b/README.md index 26c01475..37029ba2 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ ChatGLM-6B 使用了和 ChatGPT 相似的技术,针对中文问答和对话进 对 ChatGLM 进行加速的开源项目: * [ChatGLM-MNN](https://github.com/wangzhaode/ChatGLM-MNN): 一个基于 MNN 的 ChatGLM-6B C++ 推理实现,支持根据显存大小自动分配计算任务给 GPU 和 CPU * [JittorLLMs](http...
[ "README.md" ]
[]
true
zai-org/ChatGLM-6B
1,108
issue_to_patch
修改ChatSQL项目Github链接
目前项目迁移到CubleNLP组织下 https://github.com/cubenlp/ChatSQL
875a8b248e63b2874a76f2bf735815ab646b5cfb
3e57c0e68e54f5a1976cac15c4dd949dcc69f8c8
diff --git a/PROJECT.md b/PROJECT.md index 0bc58a76..1e224f05 100644 --- a/PROJECT.md +++ b/PROJECT.md @@ -17,7 +17,7 @@ * [ChatGLM-web](https://github.com/NCZkevin/chatglm-web):基于FastAPI和Vue3搭建的ChatGLM演示网站(支持chatglm流式输出、前端调整模型参数、上下文选择、保存图片、知识库问答等功能) * [ChatGLM-6B-Engineering](https://github.com/LemonQu-GIT/ChatGLM-6...
[ "PROJECT.md" ]
[]
true
zai-org/ChatGLM-6B
1,041
issue_to_patch
Fix typo: removing duplicate imports of AutoTokenizer in Trarnsformer.
a4119fd3ade35988daeab6793adca520a1615eb0
12e3670b48ec70be161fa6bd1b119520ba3bd862
diff --git a/ptuning/main.py b/ptuning/main.py index 49b08b0e..17e18b5b 100644 --- a/ptuning/main.py +++ b/ptuning/main.py @@ -35,7 +35,6 @@ AutoConfig, AutoModel, AutoTokenizer, - AutoTokenizer, DataCollatorForSeq2Seq, HfArgumentParser, Seq2SeqTrainingArguments,
[ "ptuning/main.py" ]
[]
true
zai-org/ChatGLM-6B
1,015
issue_to_patch
Update README.md
e19f477dab45c72048fda267f2bad8b42c1f864e
746a3e1567660fd2416bb3b269518f700919ec37
diff --git a/README.md b/README.md index f39272db..fec89486 100644 --- a/README.md +++ b/README.md @@ -224,7 +224,7 @@ model = load_model_on_gpus("THUDM/chatglm-6b", num_gpus=2) **[2023/03/31]** 增加基于 [P-Tuning-v2](https://github.com/THUDM/P-tuning-v2) 的高效参数微调实现,INT4 量化级别下最低只需 7GB 显存即可进行模型微调。详见[高效参数微调方法](ptuning/READ...
[ "README.md" ]
[]
true
zai-org/ChatGLM-6B
954
issue_to_patch
修复预测结果为空的bug
fix:修复预测过程中存在输入长度超过512时,导致所有预测结果为空的bug
e952ec5e776c013b7bbf679b34604f9880c960b0
486edfed8144112489d620678aee2f7c2d939664
diff --git a/PROJECT.md b/PROJECT.md index f27d7e77..0bc58a76 100644 --- a/PROJECT.md +++ b/PROJECT.md @@ -17,6 +17,7 @@ * [ChatGLM-web](https://github.com/NCZkevin/chatglm-web):基于FastAPI和Vue3搭建的ChatGLM演示网站(支持chatglm流式输出、前端调整模型参数、上下文选择、保存图片、知识库问答等功能) * [ChatGLM-6B-Engineering](https://github.com/LemonQu-GIT/ChatGLM-6...
[ "PROJECT.md", "cli_demo.py", "ptuning/main.py", "web_demo2.py" ]
[]
true
zai-org/ChatGLM-6B
934
issue_to_patch
fix input unicodedecodererror
修复client输入中文退格时,input函数会抛UnicodeDecoderError异常,导致对话中断退出。 相关issue:#493
2873a6f452340565ff3cd130d5f7009a35c12154
8d516a486b2b68679ed1d575467c41b5186ac506
diff --git a/cli_demo.py b/cli_demo.py index da80fff9..3559840c 100644 --- a/cli_demo.py +++ b/cli_demo.py @@ -2,6 +2,7 @@ import platform import signal from transformers import AutoTokenizer, AutoModel +import readline tokenizer = AutoTokenizer.from_pretrained("THUDM/chatglm-6b", trust_remote_code=True) model =...
[ "cli_demo.py" ]
[]
true
zai-org/ChatGLM-6B
831
issue_to_patch
加友情链接 ChatSQL
基于ChatGLM+SBERT实现NL2SQL本地化,并直接连接数据库查询数据返回结果,使得生成的SQL语句更具有实用性。 https://github.com/yysirs/ChatSQL
cb3cdbcaf80acdd9438b68aa0b03c20f67b4ac68
286b4cb8f4175865fd0736d36e032ad08ca7ad43
diff --git a/PROJECT.md b/PROJECT.md index 14c9940c..f5654a61 100644 --- a/PROJECT.md +++ b/PROJECT.md @@ -17,6 +17,7 @@ * [ChatGLM-web](https://github.com/NCZkevin/chatglm-web):基于FastAPI和Vue3搭建的ChatGLM演示网站(支持chatglm流式输出、前端调整模型参数、上下文选择、保存图片、知识库问答等功能) * [ChatGLM-6B-Engineering](https://github.com/LemonQu-GIT/ChatGLM-6...
[ "PROJECT.md" ]
[]
true
zai-org/ChatGLM-6B
851
issue_to_patch
当前MAX_BOXES与MAX_TURNS不生效导致单次对话不终止显存不断增加最后显存溢出问题
当前MAX_BOXES与MAX_TURNS不生效导致单次对话不终止显存不断增加最后显存溢出问题,修改最大对话轮数和最大历史对话数量使其生效,逻辑为历史最大对话框记录轮数达到MAX_BOXES时截断历史对话为最近MAX_TURNS数。
2a9119bc96cf038a5a146c76370a2e7c1d5eabef
0903d2377f8c283175545471708f208f6e933e31
diff --git a/web_demo2.py b/web_demo2.py index 226682e1..ce976b3f 100644 --- a/web_demo2.py +++ b/web_demo2.py @@ -28,6 +28,8 @@ def predict(input, max_length, top_p, temperature, history=None): with container: if len(history) > 0: + if len(history)>MAX_BOXES: + history = histo...
[ "web_demo2.py" ]
[]
true
zai-org/ChatGLM-6B
861
issue_to_patch
Update PROJECT.md
We implement a **parameter-efficient RLHF training** framework for ChatGLM-6B, along with the supervised fine-tuning procedure.
c95b6b9d0d53c788ce6d16599e3a9ac75ceb1e65
78615dc1558e2646c50618bcc2368e5ea09a448c
diff --git a/PROJECT.md b/PROJECT.md index 21733b5f..f27d7e77 100644 --- a/PROJECT.md +++ b/PROJECT.md @@ -20,7 +20,7 @@ 对 ChatGLM-6B 进行微调的开源项目: * [InstructGLM](https://github.com/yanqiangmiffy/InstructGLM):基于ChatGLM-6B进行指令学习,汇总开源中英文指令数据,基于Lora进行指令数据微调,开放了Alpaca、Belle微调后的Lora权重,修复web_demo重复问题 -* [ChatGLM-Efficient-...
[ "PROJECT.md" ]
[]
true
zai-org/ChatGLM-6B
811
issue_to_patch
添加ModelWhale相关项目链接
目前官方提供了两个ChatGLM-6B相关项目: * [ChatGLM-6B 的部署与微调教程](https://www.heywhale.com/mw/project/6436d82948f7da1fee2be59e) * [ChatGLM-6B 结合 langchain 实现本地知识库 QA Bot](https://www.heywhale.com/mw/project/643977aa446c45f4592a1e59) ChatGLM近两周在平台上热度很高,两个项目fork数量很多,作为部署跑通ChatGLM是个不错的选择。希望能一并添加到Readme,帮助大家快速上手
aeced3619b804d20d2396576f6d5bc8dc8226913
73a4f77bd0838487bdd61730fc5ee9874b7c8947
diff --git a/PROJECT.md b/PROJECT.md index 3d6a50ea..49179a9a 100644 --- a/PROJECT.md +++ b/PROJECT.md @@ -24,5 +24,4 @@ 针对 ChatGLM-6B 的教程/文档: * [Windows部署文档](https://github.com/ZhangErling/ChatGLM-6B/blob/main/deployment_windows.md) -* [ChatGLM-6B 的部署与微调教程 @ModelWhale平台](https://www.heywhale.com/mw/project/6436d82...
[ "PROJECT.md", "README.md" ]
[]
true
zai-org/ChatGLM-6B
739
issue_to_patch
添加较成熟的开源微调项目ChatGLM-Efficient-Tuning
9f571c42f218b589a769f392f3c0950658578bda
afe08a19ccadc8b238c218b245bb4c1c62598588
diff --git a/PROJECT.md b/PROJECT.md index c69bcbb5..e23df210 100644 --- a/PROJECT.md +++ b/PROJECT.md @@ -18,9 +18,11 @@ 对 ChatGLM-6B 进行微调的开源项目: * [InstructGLM](https://github.com/yanqiangmiffy/InstructGLM):基于ChatGLM-6B进行指令学习,汇总开源中英文指令数据,基于Lora进行指令数据微调,开放了Alpaca、Belle微调后的Lora权重,修复web_demo重复问题 +* [ChatGLM-Efficient...
[ "PROJECT.md" ]
[]
true
zai-org/ChatGLM-6B
780
issue_to_patch
更新对基于 langchain 的 ChatGLM 应用项目 langchain-chatglm 的介绍
0a05145a2c57602b668e790a5bb6f18c1211e100
8d89e283d71240fe70b27d15046a7459a5cc13d9
diff --git a/PROJECT.md b/PROJECT.md index 3d6a50ea..af7d6edc 100644 --- a/PROJECT.md +++ b/PROJECT.md @@ -13,7 +13,7 @@ * [glm-bot](https://github.com/initialencounter/glm-bot):将ChatGLM接入Koishi可在各大聊天平台上调用ChatGLM * [Chinese-LangChain](https://github.com/yanqiangmiffy/Chinese-LangChain):中文langchain项目,基于ChatGLM-6b+lang...
[ "PROJECT.md", "README.md" ]
[]
true
zai-org/ChatGLM-6B
802
issue_to_patch
增加友情链接 ChatGLM-OpenAI-API
Provide OpenAI style API for ChatGLM-6B and Chinese Embeddings Model
aeced3619b804d20d2396576f6d5bc8dc8226913
53c8d21f0dda5b49dbb9bd543bb4020b71ac9aff
diff --git a/PROJECT.md b/PROJECT.md index 3d6a50ea..c3fa84f9 100644 --- a/PROJECT.md +++ b/PROJECT.md @@ -16,6 +16,7 @@ * [langchain-ChatGLM](https://github.com/imClumsyPanda/langchain-ChatGLM):基于本地知识的 ChatGLM 应用,基于LangChain * [ChatGLM-web](https://github.com/NCZkevin/chatglm-web):基于FastAPI和Vue3搭建的ChatGLM演示网站(支持chat...
[ "PROJECT.md" ]
[]
true
zai-org/ChatGLM-6B
756
issue_to_patch
Update PROJECT.md
d685f6ed8a6f17051a0230ee5628c98d1af3b593
01ee804e7c033104388272846df61ea51ce1bb4d
diff --git a/PROJECT.md b/PROJECT.md index c69bcbb5..3d6a50ea 100644 --- a/PROJECT.md +++ b/PROJECT.md @@ -15,6 +15,7 @@ * [bibliothecarius](https://github.com/coderabbit214/bibliothecarius):快速构建服务以集成您的本地数据和AI模型,支持ChatGLM等本地化模型接入。 * [langchain-ChatGLM](https://github.com/imClumsyPanda/langchain-ChatGLM):基于本地知识的 ChatG...
[ "PROJECT.md" ]
[]
true
zai-org/ChatGLM-6B
719
issue_to_patch
添加友情链接
* [搭建深度学习docker容器 - Luck_zy](https://www.luckzym.com/tags/ChatGLM-6B/)
8e83083d7fe0dd1a6b7f828b1332bab0d9412ae8
a6af7c4bcb1569b24804812cf1e0f54cc59ebccc
diff --git a/PROJECT.md b/PROJECT.md index 19119c23..775bf212 100644 --- a/PROJECT.md +++ b/PROJECT.md @@ -18,3 +18,4 @@ 以下是部分针对本项目的教程/文档: * [Windows部署文档](https://github.com/ZhangErling/ChatGLM-6B/blob/main/deployment_windows.md) * [ChatGLM-6B 的部署与微调教程 @ModelWhale平台](https://www.heywhale.com/mw/project/6436d82948f7d...
[ "PROJECT.md" ]
[]
true
zai-org/ChatGLM-6B
707
issue_to_patch
ptuning-v2微调适配的web_demo.
01e6313abf4122d789d6e68128856af52847b355
8e85119d7cf587b30c442e04428dc3510b716962
diff --git a/ptuning/web_demo.py b/ptuning/web_demo.py new file mode 100644 index 00000000..43d0c826 --- /dev/null +++ b/ptuning/web_demo.py @@ -0,0 +1,166 @@ +import os, sys + +import gradio as gr +import mdtex2html + +import torch +import transformers +from transformers import ( + AutoConfig, + AutoModel, + ...
[ "ptuning/web_demo.py", "ptuning/web_demo.sh" ]
[]
true
zai-org/ChatGLM-6B
685
issue_to_patch
Update PROJECT.md
[Chinese-LangChain](https://github.com/yanqiangmiffy/Chinese-LangChain):中文langchain项目,基于ChatGLM-6b+langchain实现本地化知识库检索与智能答案生成,增加web search功能、知识库选择功能和支持知识增量更新
01e6313abf4122d789d6e68128856af52847b355
7df785fc4ef895997a33d7fa9dd068fb06e406e3
diff --git a/PROJECT.md b/PROJECT.md index 47982597..264d4969 100644 --- a/PROJECT.md +++ b/PROJECT.md @@ -12,6 +12,7 @@ * [InstructGLM](https://github.com/yanqiangmiffy/InstructGLM):基于ChatGLM-6B进行指令学习,汇总开源中英文指令数据,基于Lora进行指令数据微调,开放了Alpaca、Belle微调后的Lora权重,修复web_demo重复问题 * [ChatGLM-web](https://github.com/NCZkevin/chat...
[ "PROJECT.md" ]
[]
true
zai-org/ChatGLM-6B
704
issue_to_patch
Add project reference to https://github.com/binary-husky/chatgpt_academic
01e6313abf4122d789d6e68128856af52847b355
8a953dfaf07dbdb23429e241bd30b1f880a3e65c
diff --git a/PROJECT.md b/PROJECT.md index 47982597..0338f585 100644 --- a/PROJECT.md +++ b/PROJECT.md @@ -2,6 +2,7 @@ 以下是部分基于本仓库开发的开源项目: * [SwissArmyTransformer](https://github.com/THUDM/SwissArmyTransformer): 一个Transformer统一编程框架,ChatGLM-6B已经在SAT中进行实现并可以进行P-tuning微调。 +* [chatgpt_academic](https://github.com/binary...
[ "PROJECT.md" ]
[]
true
zai-org/ChatGLM-6B
241
issue_to_patch
Add Multi-GPU support
多卡支持,会将模型自动平均的分配到多GPU中,并且相邻的 transformer.layers 会尽量分配到同一GPU,自动适配不同量化模型。 将 model 和 tokenizer 的加载逻辑统一整合到 utils 中
9addb875ca503a37804fb82d55991b2f7392f8f9
c313af0639b9d1c27a8d5e65f73b6ed683e63ee3
diff --git a/README.md b/README.md index 58f3751a..788ed81e 100644 --- a/README.md +++ b/README.md @@ -161,6 +161,17 @@ model = AutoModel.from_pretrained("your local path", trust_remote_code=True).hal ``` 即可使用在 Mac 上使用 GPU 加速模型推理。 +### 多卡部署 +```shell +pip install accelerate +``` + +```python +from utils import load...
[ "README.md", "README_en.md", "api.py", "cli_demo.py", "requirements.txt", "utils.py", "web_demo.py", "web_demo2.py" ]
[]
true
zai-org/ChatGLM-6B
574
issue_to_patch
PROJECT.md 中添加ModelWhale在线版ChatGLM-6B的部署、微调教程项目
使用ModelWhale社区提供的 V100 机型,跑通了ChatGLM-6B部署、微调 pipeline,官方示例的微调流程跑下来效果很不错 https://www.heywhale.com/mw/project/6436d82948f7da1fee2be59e
ab6bcb4968bef335175c0b01972657961b2b1250
47ac7f9b1f1cc00dabc80dcccedf1b80b7b2ee4e
diff --git a/PROJECT.md b/PROJECT.md index ce9a91c3..47982597 100644 --- a/PROJECT.md +++ b/PROJECT.md @@ -15,3 +15,4 @@ 以下是部分针对本项目的教程/文档: * [Windows部署文档](https://github.com/ZhangErling/ChatGLM-6B/blob/main/deployment_windows.md) +* [ChatGLM-6B 的部署与微调教程 @ModelWhale平台](https://www.heywhale.com/mw/project/6436d82948f...
[ "PROJECT.md" ]
[]
true
zai-org/ChatGLM-6B
563
issue_to_patch
添加友情链接
[glm-bot](https://github.com/initialencounter/glm-bot):将ChatGLM接入Koishi可在各大聊天平台上调用ChatGLM
7410cacd911dd73c94b8e68932ffc50ea4f6acc3
1c2184b8e7f480333b8b0eeac29c0a3cc2143e53
diff --git a/PROJECT.md b/PROJECT.md index 59f34ff9..ce9a91c3 100644 --- a/PROJECT.md +++ b/PROJECT.md @@ -11,6 +11,7 @@ * [ChatGLM-Finetuning](https://github.com/liucongg/ChatGLM-Finetuning):基于ChatGLM-6B模型,进行下游具体任务微调,涉及Freeze、Lora、P-tuning等,并进行实验效果对比。 * [InstructGLM](https://github.com/yanqiangmiffy/InstructGLM):基于C...
[ "PROJECT.md" ]
[]
true
zai-org/ChatGLM-6B
526
issue_to_patch
Update PROJECT.md:添加ChatGLM-web项目
项目添加:基于FastAPI和Vue3搭建的ChatGLM演示网站(支持chatglm流式输出、前端调整模型参数、上下文选择、保存图片、知识库问答等功能) 。 方便大家私有化部署在内网使用,预览地址 [chatglm.nczkevin.com](http://chatglm.nczkevin.com/)
0c2806fea82683349194e21996dd6b3acc3c265b
1d87dac585c8fafd708db16860b628928ec5a821
diff --git a/PROJECT.md b/PROJECT.md index c529b1eb..59f34ff9 100644 --- a/PROJECT.md +++ b/PROJECT.md @@ -10,6 +10,7 @@ * [JittorLLMs](https://github.com/Jittor/JittorLLMs):最低3G显存或者没有显卡都可运行 ChatGLM-6B FP16, 支持Linux、windows、Mac部署 * [ChatGLM-Finetuning](https://github.com/liucongg/ChatGLM-Finetuning):基于ChatGLM-6B模型,进行...
[ "PROJECT.md" ]
[]
true
zai-org/ChatGLM-6B
477
issue_to_patch
Update README.md:添加ChatGLM项目
项目添加:基于ChatGLM-6B模型,进行下游具体任务微调,涉及Freeze、Lora、P-tuning等,并进行实验效果对比。
0a38501a0c0e3295eb4e5b3c8dab56c9777c439b
5111a422a48240fa53b99c75572de136c9740ced
diff --git a/README.md b/README.md index 28a95530..56059b8e 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ ChatGLM-6B 使用了和 ChatGPT 相似的技术,针对中文问答和对话进 * [闻达](https://github.com/l15y/wenda):大型语言模型调用平台,基于 ChatGLM-6B 实现了类 ChatPDF 功能 * [JittorLLMs](https://github.com/Jittor/JittorLLMs):最低3G显存或者没有显卡都可运行 ChatGLM-6B ...
[ "README.md" ]
[]
true
zai-org/ChatGLM-6B
439
issue_to_patch
错别字修正
68488f1f6cc6ab2781e23efbad9f86abcc51dcf4
d694a0087efaff3cabbf94fbf9b5ab12ec49d888
diff --git a/ptuning/README.md b/ptuning/README.md index 753d895b..8ec1d6d0 100644 --- a/ptuning/README.md +++ b/ptuning/README.md @@ -6,7 +6,7 @@ *Read this in [English](README_en.md).* ## 软件依赖 -运行微调需要4.27.1版本的`transformers`。除 ChatGLM-6B 的依赖之外,还需要按照以下依赖 +运行微调需要4.27.1版本的`transformers`。除 ChatGLM-6B 的依赖之外,还需要安装以下依赖 ...
[ "ptuning/README.md" ]
[]
true
zai-org/ChatGLM-6B
433
issue_to_patch
Update web_demo2.py
Add slide bar
e3943665505f324f6136d5d65f0c94d8019caac7
c44c68c5a2bd0db07e4e0d239a6fd3b79fae39db
diff --git a/web_demo2.py b/web_demo2.py index 4e1f0e4b..226682e1 100644 --- a/web_demo2.py +++ b/web_demo2.py @@ -21,7 +21,7 @@ def get_model(): MAX_BOXES = MAX_TURNS * 2 -def predict(input, history=None): +def predict(input, max_length, top_p, temperature, history=None): tokenizer, model = get_model() ...
[ "web_demo2.py" ]
[]
true
zai-org/ChatGLM-6B
427
issue_to_patch
添加 ChatGLM-Finetuning项目
基于ChatGLM-6B模型,进行下游具体任务微调,涉及Freeze、Lora、P-tuning等,并进行多种实验效果对比。
6426660124373b622b28d0efb817d49464df1808
eb22e3ad6a55d9834102eee077b4a98ca393724f
diff --git a/README.md b/README.md index 391126ed..5f9689c7 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ ChatGLM-6B 使用了和 ChatGPT 相似的技术,针对中文问答和对话进 * [bibliothecarius](https://github.com/coderabbit214/bibliothecarius):快速构建服务以集成您的本地数据和AI模型,支持ChatGLM等本地化模型接入。 * [闻达](https://github.com/l15y/wenda):大型语言模型调用平台,基...
[ "README.md" ]
[]
true
zai-org/ChatGLM-6B
378
issue_to_patch
添加JittorLLMs支持链接
a1fcd5218244b9fa480cc18c2a6503b372d23fb6
5cd99594841f971bbe79556b6597f99877d800f1
diff --git a/README.md b/README.md index d75ede66..c63913c5 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ ChatGLM-6B 使用了和 ChatGPT 相似的技术,针对中文问答和对话进 * [langchain-ChatGLM](https://github.com/imClumsyPanda/langchain-ChatGLM):基于本地知识的 ChatGLM 应用,基于LangChain * [bibliothecarius](https://github.com/coderabbit214/bi...
[ "README.md" ]
[]
true
zai-org/ChatGLM-6B
373
issue_to_patch
Fix bug In Makedown [```]
Before: ![图片](https://user-images.githubusercontent.com/61142316/229559309-854a7d2d-2cdf-4c5c-a29e-cc22483c4cf7.png) After: ![图片](https://user-images.githubusercontent.com/61142316/229559238-d7c436d2-522b-4293-9da1-fae2ff5f9cdf.png)
ec069419becceac2d69a07149c07b9fc564e19db
91e4f29563918e88df0d39256bc7b8f66d1c0f8f
diff --git a/web_demo3.py b/web_demo3.py index 203ba1fd..7c0777c2 100644 --- a/web_demo3.py +++ b/web_demo3.py @@ -24,11 +24,45 @@ def postprocess(self, y): gr.Chatbot.postprocess = postprocess +def parse_text(text): + """copy from https://github.com/GaiZhenbiao/ChuanhuChatGPT/""" + lines = text.split("\n") ...
[ "web_demo3.py" ]
[]
true
zai-org/ChatGLM-6B
372
issue_to_patch
A Better Gradio WebUI Implement
![图片](https://user-images.githubusercontent.com/61142316/229552399-c89a659e-f6a9-422b-84c0-4766017b1915.png)
7d7d87c4bd26d84485e09d284437fc0682deb45f
6148d6d6ac41a416846df1ebfa9b1341a1f69859
diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c3dd476a --- /dev/null +++ b/.gitignore @@ -0,0 +1,133 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +dow...
[ ".gitignore", "README.md", "README_en.md", "cli_demo.py", "ptuning/README.md", "ptuning/arguments.py", "ptuning/evaluate.sh", "ptuning/main.py", "ptuning/train.sh", "ptuning/trainer_seq2seq.py", "requirements.txt", "web_demo3.py" ]
[]
true
zai-org/ChatGLM-6B
367
issue_to_patch
fix finetune pad bug and add sat readme
Hi, I found that the training labels has pad bug and I fixed it. Moreover, I add a link in readme of [SAT-chatglm](https://github.com/THUDM/SwissArmyTransformer/tree/main/examples/chatglm).
fd172db3324aecbe431a7d518c0622b611e17a3e
5de005540878b057be34601084a5803dcec08d01
diff --git a/README.md b/README.md index 81f3fdc2..d75ede66 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ ChatGLM-6B 使用了和 ChatGPT 相似的技术,针对中文问答和对话进 ## 友情链接 以下是部分基于本仓库开发的开源项目: +* [SwissArmyTransformer](https://github.com/THUDM/SwissArmyTransformer): 一个Transformer统一编程框架,ChatGLM-6B已经在SAT中进行实现并可以进行P-tuning微调。...
[ "README.md", "ptuning/main.py" ]
[]
true
zai-org/ChatGLM-6B
350
issue_to_patch
bibliothecarius:快速构建服务以集成您的本地数据和AI模型,支持ChatGLM等本地化模型接入。
4227999d4c61f17bacf9d09272168cbd46f5b1f5
06038d8e3f51e58ed02d67aafc2c3795b556dc2e
diff --git a/README.md b/README.md index a286cee8..81f3fdc2 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ ChatGLM-6B 使用了和 ChatGPT 相似的技术,针对中文问答和对话进 * [ChatGLM-MNN](https://github.com/wangzhaode/ChatGLM-MNN): 一个基于 MNN 的 ChatGLM-6B C++ 推理实现,支持根据显存大小自动分配计算任务给 GPU 和 CPU * [ChatGLM-Tuning](https://github.com/mym...
[ "README.md" ]
[]
true
zai-org/ChatGLM-6B
322
issue_to_patch
chore(cli_demo): strip the query input for `stop` or `clear` command
Remove the query space to determine whether it is a stop command or a clear command. 如果不小心前后多打了空格,例如 `stop ` ` stop ` 等,则无法退出,简单修改了一下。
ff3761fc1a5fef73639f95bbe4bcb08c1ce8531b
6dd6f7c7b53604fb8eee2aa27509619752bf3133
diff --git a/cli_demo.py b/cli_demo.py index 1c3ff2b5..da80fff9 100644 --- a/cli_demo.py +++ b/cli_demo.py @@ -31,9 +31,9 @@ def main(): print("欢迎使用 ChatGLM-6B 模型,输入内容即可进行对话,clear 清空对话历史,stop 终止程序") while True: query = input("\n用户:") - if query == "stop": + if query.strip() == "stop": ...
[ "cli_demo.py" ]
[]
true
zai-org/ChatGLM-6B
320
issue_to_patch
Update README.md
ff3761fc1a5fef73639f95bbe4bcb08c1ce8531b
acd4adcb651211bcc4b01c86e92ed09de2edf413
diff --git a/README.md b/README.md index 73ea77f6..1f82c03e 100644 --- a/README.md +++ b/README.md @@ -169,6 +169,8 @@ model = AutoModel.from_pretrained("your local path", trust_remote_code=True).hal ## 高效参数微调 基于 [P-tuning v2](https://github.com/THUDM/P-tuning-v2) 的高效参数微调。具体使用方法详见 [ptuning/README.md](ptuning/README.m...
[ "README.md" ]
[]
true
zai-org/ChatGLM-6B
313
issue_to_patch
writing generated result with utf-8
Ignoring `encoding="utf-8` when writing generated result will encounter`'ascii' codec can't encode character : ordinal not in range (128)`.
ff3761fc1a5fef73639f95bbe4bcb08c1ce8531b
7a67ddd61f65e4326c96c7c02ee48027151abccb
diff --git a/ptuning/main.py b/ptuning/main.py index 5b232345..d1c4977d 100644 --- a/ptuning/main.py +++ b/ptuning/main.py @@ -374,9 +374,10 @@ def compute_metrics(eval_preds): ) labels = [label.strip() for label in labels] output_prediction_file = os.path.join(trainin...
[ "ptuning/main.py" ]
[]
true
zai-org/ChatGLM-6B
225
issue_to_patch
Support stream out interruption by using Ctrl+C
当模型输出很长时,我们有时会希望打断模型输出。此PR增加了使用Ctrl+C来打断模型输出的功能。
6fc8141a9c9c57fe2e4897ff93491a9a61b0fb16
bf39dac0670d4cbb734aaa4664001f1863cecf14
diff --git a/cli_demo.py b/cli_demo.py index 8a043fb4..fea47fcc 100644 --- a/cli_demo.py +++ b/cli_demo.py @@ -1,14 +1,15 @@ import os import platform +import signal from transformers import AutoTokenizer, AutoModel -tokenizer = AutoTokenizer.from_pretrained("THUDM/chatglm-6b", trust_remote_code=True) -model = Aut...
[ "cli_demo.py" ]
[]
true
zai-org/ChatGLM-6B
235
issue_to_patch
update api.py
1. Add parameters of model.chat to api.py. 2. Add torch_clear_gc to prevent from gpu storage leakage after long time running. 3. Fix univorn.run parameter to fix the bug that models may be loaded twice, and gpu cache are used twice as big as directly run the ChatGLM-6B model.
bc973445c86d7315e79b9013c554a76e31921304
023c46a317537c9f2a6bdfc4916c77b24a00d868
diff --git a/api.py b/api.py index 10f70b69..4ad1db66 100644 --- a/api.py +++ b/api.py @@ -1,6 +1,19 @@ from fastapi import FastAPI, Request from transformers import AutoTokenizer, AutoModel import uvicorn, json, datetime +import torch + +DEVICE = "cuda" +DEVICE_ID = "0" +CUDA_DEVICE = f"{DEVICE}:{DEVICE_ID}" if DEV...
[ "api.py" ]
[]
true
zai-org/ChatGLM-6B
221
issue_to_patch
修复api服务启动错误
第31行【API】->【api】会因为大小写原因找不到API 第34行的下划线【chatglm_6b】->【chatglm-6b】会导致模型加载错误 #218 [BUG/Help] <python3 api.py报错> #219 未补充的模型下划线问题
955d4750798fad3121aa4470dc20d18339b810c6
acbc2e178a1aae2fcd44030e93c0de5733f5a1c8
diff --git a/api.py b/api.py index 14a2d578..10f70b69 100644 --- a/api.py +++ b/api.py @@ -28,8 +28,8 @@ async def create_item(request: Request): if __name__ == '__main__': - uvicorn.run('API:app', host='0.0.0.0', port=8000, workers=1) + uvicorn.run('api:app', host='0.0.0.0', port=8000, workers=1) tokeniz...
[ "api.py" ]
[]
true
zai-org/ChatGLM-6B
223
issue_to_patch
Update api.py
bug fix
28665ade15d173ee60a6f2b904f70110912e99d4
1047e446e5387aa06c856c95800f67beab8b80d4
diff --git a/api.py b/api.py index 14a2d578..10f70b69 100644 --- a/api.py +++ b/api.py @@ -28,8 +28,8 @@ async def create_item(request: Request): if __name__ == '__main__': - uvicorn.run('API:app', host='0.0.0.0', port=8000, workers=1) + uvicorn.run('api:app', host='0.0.0.0', port=8000, workers=1) tokeniz...
[ "api.py" ]
[]
true
zai-org/ChatGLM-6B
159
issue_to_patch
Add API.py
Adding API.py to access the ChatGLM-6B with API post json like this: { prompt:"114514" }
af7f1d46709412056367dad52ea8830c9866b87d
c133b53d51665fb4a228deb37c1f3b16b1ca5e01
diff --git a/API.py b/API.py new file mode 100644 index 00000000..7149f786 --- /dev/null +++ b/API.py @@ -0,0 +1,33 @@ +from typing import Optional +from fastapi import FastAPI, Request +from pydantic import BaseModel +from transformers import AutoTokenizer, AutoModel +import uvicorn, json, time, datetime, os, platform...
[ "API.py" ]
[]
true
zai-org/ChatGLM-6B
207
issue_to_patch
Added a link to streaming demo on Huggingface
5513dd7d2c61023adb5a48d4b723e8ff35163837
44356fcf3b543016bcc7af4eb83e5991b0295331
diff --git a/README.md b/README.md index 734ce708..3585aa91 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,8 @@ ChatGLM-6B 使用了和 ChatGPT 相似的技术,针对中文问答和对话进 ## 更新信息 **[2023/03/19]** 增加流式输出接口 `stream_chat`,已更新到网页版和命令行 Demo。修复输出中的中文标点。增加量化后的模型 [ChatGLM-6B-INT4](https://huggingface.co/THUDM/chatglm-6b-int4) +上的流媒体演示 ...
[ "README.md" ]
[]
true
zai-org/ChatGLM-6B
192
issue_to_patch
support stream chat
52aa3261d7146749bdc9db07757c7b85bc48a7a4
ee76342382e5894f45f44ad04bc6b047df26cce4
diff --git a/README.md b/README.md index b6271d3c..734ce708 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,12 @@ ChatGLM-6B 是一个开源的、支持中英双语的对话语言模型,基于 [General Language Model (GLM)](https://github.com/THUDM/GLM) 架构,具有 62 亿参数。结合模型量化技术,用户可以在消费级的显卡上进行本地部署(INT4 量化级别下最低只需 6GB 显存)。 ChatGLM-6B 使用了和 ChatGPT 相似的技术,针对中文问答和对话进...
[ "README.md", "README_en.md", "requirements.txt", "resources/web-demo.gif", "web_demo.py", "web_demo2.py" ]
[]
true
zai-org/ChatGLM-6B
62
issue_to_patch
Add some parameter support in web demo
Add parameter support for Maximum length, Top P and Temperature in web demo
fc4ac835014200a3ef4d6f4795572f41b325265e
702c2ca2a8169bd830ecba8a524e890a2502b457
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml new file mode 100644 index 00000000..5798ad02 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -0,0 +1,63 @@ +name: 🐞 Bug/Help +description: File a bug/issue +title: "[BUG/Help] <title>" +labels: [] +body: +- type...
[ ".github/ISSUE_TEMPLATE/bug_report.yaml", ".github/ISSUE_TEMPLATE/config.yml", ".github/ISSUE_TEMPLATE/feature_request.yml", "README.md", "limitations/factual_error.png", "limitations/math_error.png", "limitations/self-confusion_google.jpg", "limitations/self-confusion_openai.jpg", "limitations/self...
[]
true
zai-org/ChatGLM-6B
41
issue_to_patch
fix skip_init import error
`skip_init` is only available for torch >= 1.10. Add this to `requirements.txt`.
c55ecd89a079b86620cc722f2e21a14e3718d0f3
3cbd413ae54abe8012e862f274708b811f01d4e8
diff --git a/requirements.txt b/requirements.txt index 126764b8..7de91f9b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ protobuf>=3.19.5,<3.20.1 transformers>=4.26.1 icetk cpm_kernels +torch>=1.10
[ "requirements.txt" ]
[]
true
zai-org/ChatGLM-6B
19
issue_to_patch
Fix `clear` command performance in Windows
1e40acce6a3d98f971a41c1246ff3b3f31d7d34e
fb94fe80a03271a8cdf79ee99d62fe943729ce81
diff --git a/cli_demo.py b/cli_demo.py index 07cfd6f8..ccdb26b5 100644 --- a/cli_demo.py +++ b/cli_demo.py @@ -1,10 +1,13 @@ import os +import platform from transformers import AutoTokenizer, AutoModel tokenizer = AutoTokenizer.from_pretrained("THUDM/chatglm-6b", trust_remote_code=True) model = AutoModel.from_pre...
[ "cli_demo.py" ]
[]
true
zai-org/ChatGLM-6B
20
issue_to_patch
Update README.md
HuggingFace -> Hugging Face
6a5a6326f9ff133f3dfda42fa6e2da70b7c101e5
cebef2817a49407d76382e68f777f77a38d6b16f
diff --git a/README.md b/README.md index 92239e40..3354bb96 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ ChatGLM-6B 是一个开源的、支持中英双语的对话语言模型,基于 如果这些方法无法帮助你入睡,你可以考虑咨询医生或睡眠专家,寻求进一步的建议。 ``` -完整的模型实现可以在 [HuggingFace Hub](https://huggingface.co/THUDM/chatglm-6b) 上查看。 +完整的模型实现可以在 [Hugging Face Hub](https://huggin...
[ "README.md" ]
[]
true
zai-org/ChatGLM-6B
15
issue_to_patch
Add CPU support with less than 16G memory
0c6d1750ef6042338534c3c97002175fa1ae0499
a10fbd88e1018f19e2f3e56e3f002026d0bc05b4
diff --git a/README.md b/README.md index 9350de7e..92239e40 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,12 @@ model = AutoModel.from_pretrained("THUDM/chatglm-6b", trust_remote_code=True).fl ``` CPU上推理速度可能会比较慢。 +以上方法需要32G内存。如果你只有16G内存,可以尝试 +```python +model = AutoModel.from_pretrained("THUDM/chatglm-6b", ...
[ "README.md" ]
[]
true
zaproxy/zaproxy
9,359
issue_to_patch
Update dependencies
Bumps the gradle group with 2 updates: [com.fifesoft:rsyntaxtextarea](https://github.com/bobbylight/rsyntaxtextarea) and [xom:xom](https://github.com/elharo/xom). Updates `com.fifesoft:rsyntaxtextarea` from 3.6.2 to 3.6.3 <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/bobbyl...
6e2c880bb88035106322c2253c2258260e98edeb
5b457cdcbc49446f635f38f3ce0dd062d30e3926
diff --git a/LEGALNOTICE.md b/LEGALNOTICE.md index 6b2620b6777..2711a417a6e 100644 --- a/LEGALNOTICE.md +++ b/LEGALNOTICE.md @@ -58,6 +58,6 @@ and subject to their respective licenses. | log4j-api-2.26.0.jar | Apache 2.0 | | log4j-core-2.26.0.jar | Apache 2.0 ...
[ "LEGALNOTICE.md", "gradle/libs.versions.toml" ]
[]
true
zaproxy/zaproxy
9,353
issue_to_patch
Fix quit after user cancel in macOS
On macOS if there was unsaved data in a session and the user Quit but then canceled, the next time they quit nothing happened. It now behaves as expected.
7f05893c7f4223697c870f942888d73d1d1033e7
5e88926d1a63d55f0121f9cc40c20f7fdc724218
diff --git a/zap/gradle/japicmp.yaml b/zap/gradle/japicmp.yaml index ea21a2cffbb..e80413c0a29 100644 --- a/zap/gradle/japicmp.yaml +++ b/zap/gradle/japicmp.yaml @@ -20,4 +20,6 @@ classExcludes: methodExcludes: - "org.parosproxy.paros.model.OptionsParam#getCertificateParam()" - "org.parosproxy.paros.model.OptionsPa...
[ "zap/gradle/japicmp.yaml", "zap/src/main/java/org/parosproxy/paros/control/Control.java", "zap/src/main/java/org/parosproxy/paros/control/MenuFileControl.java", "zap/src/main/java/org/zaproxy/zap/OsXGui.java" ]
[ { "comment": "It was calling this method to ensure both menu and the shortcut use the same code path…", "path": "zap/src/main/java/org/zaproxy/zap/OsXGui.java", "hunk": "@@ -80,8 +80,4 @@ private static void showAboutDialog() {\n private static void showOptionsDialog() {\n Control.getSinglet...
true
zaproxy/zaproxy
9,353
comment_to_fix
Fix quit after user cancel in macOS
It was calling this method to ensure both menu and the shortcut use the same code path…
7f05893c7f4223697c870f942888d73d1d1033e7
5e88926d1a63d55f0121f9cc40c20f7fdc724218
diff --git a/zap/src/main/java/org/zaproxy/zap/OsXGui.java b/zap/src/main/java/org/zaproxy/zap/OsXGui.java index 4e1305c8ebb..e6f1348bdbe 100644 --- a/zap/src/main/java/org/zaproxy/zap/OsXGui.java +++ b/zap/src/main/java/org/zaproxy/zap/OsXGui.java @@ -22,6 +22,7 @@ import java.awt.Desktop; import java.awt.Image; im...
[ "zap/src/main/java/org/zaproxy/zap/OsXGui.java" ]
[ { "comment": "It was calling this method to ensure both menu and the shortcut use the same code path…", "path": "zap/src/main/java/org/zaproxy/zap/OsXGui.java", "hunk": "@@ -80,8 +80,4 @@ private static void showAboutDialog() {\n private static void showOptionsDialog() {\n Control.getSinglet...
true
zaproxy/zaproxy
9,355
issue_to_patch
Update localized resources
Update resources from Crowdin.
843d68c4e0a7e0fda548a1ba8ba0f3ee3a538a1e
cc2b2c39f3ad0f05ecf8b8343b9eea6294e2c7be
diff --git a/zap/src/main/dist/lang/Messages_it_IT.properties b/zap/src/main/dist/lang/Messages_it_IT.properties index e01a705b90d..d2eecac1dea 100644 --- a/zap/src/main/dist/lang/Messages_it_IT.properties +++ b/zap/src/main/dist/lang/Messages_it_IT.properties @@ -167,7 +167,7 @@ api.error.bad_script_format = Si \u00e8...
[ "zap/src/main/dist/lang/Messages_it_IT.properties" ]
[]
true
zaproxy/zaproxy
9,354
issue_to_patch
Bump the gradle group with 3 updates
Bumps the gradle group with 3 updates: [biz.aQute.bnd:biz.aQute.bnd.annotation](https://github.com/bndtools/bnd), [net.bytebuddy:byte-buddy](https://github.com/raphw/byte-buddy) and org.sonarqube. Updates `biz.aQute.bnd:biz.aQute.bnd.annotation` from 7.2.3 to 7.3.0 <details> <summary>Release notes</summary> <p><em>Sou...
5de642124a5e45956f787bc561389acc4bb421c9
a5be5f80c5b3ee44d38eb9d7c4b0b266f3db66ee
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ebf0dd03b63..d81f0e26dd5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,8 +4,8 @@ flatlaf = "3.7.1" log4j = "2.26.0" [libraries] -bndAnnotation = "biz.aQute.bnd:biz.aQute.bnd.annotation:7.2.3" -bytebuddy = "net.by...
[ "gradle/libs.versions.toml" ]
[]
true
zaproxy/zaproxy
9,352
issue_to_patch
Bump the gha group with 5 updates
Bumps the gha group with 5 updates: | Package | From | To | | --- | --- | --- | | [dessant/lock-threads](https://github.com/dessant/lock-threads) | `6.0.0` | `6.0.2` | | [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) | `4.0.0` | `4.1.0` | | [docker/setup-buildx-action](https://github.com/docke...
9d22754be90b27da40717ce50d6184efbfecd488
07ed01ec23dc429ffc796847e1147f8ea1174a3a
diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index a93f3c1eef3..36cf1de1850 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -12,7 +12,7 @@ jobs: action: runs-on: ubuntu-latest steps: - - uses: dessant/lock-threads@7266a7ce5c1df01b1c6db85bf8cd86c737da...
[ ".github/workflows/lock.yml", ".github/workflows/release-live-docker.yml", ".github/workflows/release-main-docker.yml", ".github/workflows/release-weekly-docker.yml", ".github/workflows/run-integration-tests.yml" ]
[]
true
zaproxy/zaproxy
9,339
issue_to_patch
Deprecate and unhook params extension
Deprecate params extension classes, and remove from CoreFunctionality. Part of zaproxy/zaproxy#9210
c3f45816d4c2b7f570aa5db1415384f6886a8070
1d6a45ff4aa811b7e17f02013d36afa9c1ef65f6
diff --git a/zap/src/main/java/org/parosproxy/paros/db/Database.java b/zap/src/main/java/org/parosproxy/paros/db/Database.java index 960789b8f28..37eac4edf48 100644 --- a/zap/src/main/java/org/parosproxy/paros/db/Database.java +++ b/zap/src/main/java/org/parosproxy/paros/db/Database.java @@ -130,7 +130,11 @@ default vo...
[ "zap/src/main/java/org/parosproxy/paros/db/Database.java", "zap/src/main/java/org/parosproxy/paros/db/RecordParam.java", "zap/src/main/java/org/parosproxy/paros/db/TableParam.java", "zap/src/main/java/org/parosproxy/paros/db/paros/ParosDatabase.java", "zap/src/main/java/org/parosproxy/paros/db/paros/ParosTa...
[ { "comment": "Not worth changing these, they are unused.", "path": "zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties", "hunk": "@@ -2259,7 +2259,7 @@ params.table.header.values = Values\n params.toolbar.site.label = Site:\n params.toolbar.site.select = --Select Site--\n params.type.c...
true
zaproxy/zaproxy
9,339
comment_to_fix
Deprecate and unhook params extension
Not worth changing these, they are unused.
c3f45816d4c2b7f570aa5db1415384f6886a8070
1d6a45ff4aa811b7e17f02013d36afa9c1ef65f6
diff --git a/zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties b/zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties index 948ffe96301..48c7cd329c0 100644 --- a/zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties +++ b/zap/src/main/resources/org/zaproxy/zap/resources...
[ "zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties" ]
[ { "comment": "Not worth changing these, they are unused.", "path": "zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties", "hunk": "@@ -2259,7 +2259,7 @@ params.table.header.values = Values\n params.toolbar.site.label = Site:\n params.toolbar.site.select = --Select Site--\n params.type.c...
true
zaproxy/zaproxy
9,351
issue_to_patch
Update localized resources
Update resources from Crowdin.
c3f45816d4c2b7f570aa5db1415384f6886a8070
5ada97f3dcc52b5bd6ecd7c56fe5f097432f424e
diff --git a/zap/src/main/dist/lang/Messages_es_ES.properties b/zap/src/main/dist/lang/Messages_es_ES.properties index 6ebf18512c0..77d4870c0a4 100644 --- a/zap/src/main/dist/lang/Messages_es_ES.properties +++ b/zap/src/main/dist/lang/Messages_es_ES.properties @@ -1052,7 +1052,7 @@ cfu.table.header.notfrom = No desde l...
[ "zap/src/main/dist/lang/Messages_es_ES.properties" ]
[]
true
zaproxy/zaproxy
9,349
issue_to_patch
Expose HostProcess startNodes
This will allow scan rules to find out what the starting point of the scan was.
0f3519af226eab1211ab7132e9bbcbb066dcf065
a4e6bd594fe8bb2d371f0701b448316fcb8ec8f7
diff --git a/zap/src/main/java/org/parosproxy/paros/core/scanner/HostProcess.java b/zap/src/main/java/org/parosproxy/paros/core/scanner/HostProcess.java index aeecba86efc..84b2ce19117 100644 --- a/zap/src/main/java/org/parosproxy/paros/core/scanner/HostProcess.java +++ b/zap/src/main/java/org/parosproxy/paros/core/scan...
[ "zap/src/main/java/org/parosproxy/paros/core/scanner/HostProcess.java", "zap/src/test/java/org/parosproxy/paros/core/scanner/HostProcessUnitTest.java" ]
[ { "comment": "The added header note about no longer recording changes here breaks the existing per-change `// ZAP: yyyy/mm/dd ...` history style used throughout this file and doesn’t describe a specific code change. Please remove this note (and keep the standard `// ZAP:` entry format for actual changes, or omi...
diff --git a/zap/src/test/java/org/parosproxy/paros/core/scanner/HostProcessUnitTest.java b/zap/src/test/java/org/parosproxy/paros/core/scanner/HostProcessUnitTest.java index 879b00e2dda..7eb7c55a7ed 100644 --- a/zap/src/test/java/org/parosproxy/paros/core/scanner/HostProcessUnitTest.java +++ b/zap/src/test/java/org/pa...
true
zaproxy/zaproxy
9,349
comment_to_fix
Expose HostProcess startNodes
The added header note about no longer recording changes here breaks the existing per-change `// ZAP: yyyy/mm/dd ...` history style used throughout this file and doesn’t describe a specific code change. Please remove this note (and keep the standard `// ZAP:` entry format for actual changes, or omit a new entry entirely...
0f3519af226eab1211ab7132e9bbcbb066dcf065
a4e6bd594fe8bb2d371f0701b448316fcb8ec8f7
diff --git a/zap/src/main/java/org/parosproxy/paros/core/scanner/HostProcess.java b/zap/src/main/java/org/parosproxy/paros/core/scanner/HostProcess.java index aeecba86efc..84b2ce19117 100644 --- a/zap/src/main/java/org/parosproxy/paros/core/scanner/HostProcess.java +++ b/zap/src/main/java/org/parosproxy/paros/core/scan...
[ "zap/src/main/java/org/parosproxy/paros/core/scanner/HostProcess.java" ]
[ { "comment": "The added header note about no longer recording changes here breaks the existing per-change `// ZAP: yyyy/mm/dd ...` history style used throughout this file and doesn’t describe a specific code change. Please remove this note (and keep the standard `// ZAP:` entry format for actual changes, or omi...
true
zaproxy/zaproxy
9,349
comment_to_fix
Expose HostProcess startNodes
`getStartNodes()` exposes `startNodes` as-is (just wrapped as unmodifiable). Since `addStartNode(null)` is allowed today (and there’s an existing unit test covering that behaviour), callers of this new API could unexpectedly encounter `null` entries. Consider either (1) ignoring/null-checking in `setStartNode`/`addStar...
0f3519af226eab1211ab7132e9bbcbb066dcf065
a4e6bd594fe8bb2d371f0701b448316fcb8ec8f7
diff --git a/zap/src/main/java/org/parosproxy/paros/core/scanner/HostProcess.java b/zap/src/main/java/org/parosproxy/paros/core/scanner/HostProcess.java index aeecba86efc..84b2ce19117 100644 --- a/zap/src/main/java/org/parosproxy/paros/core/scanner/HostProcess.java +++ b/zap/src/main/java/org/parosproxy/paros/core/scan...
[ "zap/src/main/java/org/parosproxy/paros/core/scanner/HostProcess.java" ]
[ { "comment": "`getStartNodes()` exposes `startNodes` as-is (just wrapped as unmodifiable). Since `addStartNode(null)` is allowed today (and there’s an existing unit test covering that behaviour), callers of this new API could unexpectedly encounter `null` entries. Consider either (1) ignoring/null-checking in `...
true
zaproxy/zaproxy
9,343
issue_to_patch
Update dependencies
Bumps the gradle group with 2 updates: [xom:xom](https://github.com/elharo/xom) and [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework). Updates `xom:xom` from 1.4.2 to 1.4.4 <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/elharo/xom/releases">xom...
ac51e31dc59b0bc488aff8dbba56f07490ac5595
3b117072dd512b0864a8f750a270306c1d7a9f62
diff --git a/LEGALNOTICE.md b/LEGALNOTICE.md index c1c6e142319..6b2620b6777 100644 --- a/LEGALNOTICE.md +++ b/LEGALNOTICE.md @@ -60,4 +60,4 @@ and subject to their respective licenses. | log4j-jul-2.26.0.jar | Apache 2.0 | | rsyntaxtextarea-3.6.2.jar | BSD-3 clause ...
[ "LEGALNOTICE.md", "gradle/libs.versions.toml" ]
[]
true
zaproxy/zaproxy
9,342
issue_to_patch
Add mcp to weekly
7089d6adbfe1e0bffc4265cc50a0710e653408f9
822f94a5b7906607d6e94dec7f8842b5664a0dbd
diff --git a/zap/src/main/weekly-add-ons.json b/zap/src/main/weekly-add-ons.json index 7b5c84047ef..4a8accdfc19 100644 --- a/zap/src/main/weekly-add-ons.json +++ b/zap/src/main/weekly-add-ons.json @@ -28,6 +28,7 @@ ":addOns:httpsInfo", ":addOns:insights", ":addOns:invoke", + ":addOns:mcp", ":add...
[ "zap/src/main/weekly-add-ons.json" ]
[]
true
zaproxy/zaproxy
9,341
issue_to_patch
Added PTK Scan Rules
f6abbf1d89ce2d7b2bf389272a61e826629a2310
99348b04460506928fd46636094e8b8244cd3009
diff --git a/docs/scanners.md b/docs/scanners.md index e80cee4e775..c6f19a09611 100644 --- a/docs/scanners.md +++ b/docs/scanners.md @@ -317,6 +317,7 @@ Scan rules: 220001 PTK - SAST - DOM-based Cookie Manipulation 220002 PTK - SAST - Open Redirection 220003 PTK - SAST - DOM-based JavaScript Injection +230000 PT...
[ "docs/scanners.md" ]
[]
true
zaproxy/zaproxy
9,332
issue_to_patch
Change title capitalization
Part of #2000 Corrected title capitalization for the following strings: - Failed to Start ZAP - No Visible Tabs - Modify Existing Excluded Parameter - Add a Parameter That Needs to Be Excluded
a98cf3a053bd4ee64bcf86d8162f08d2266931a2
1d00e1e8b29f768e6fc1a71ed5a4f3b986e78668
diff --git a/zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties b/zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties index 27e83d872d2..948ffe96301 100644 --- a/zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties +++ b/zap/src/main/resources/org/zaproxy/zap/resources...
[ "zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties" ]
[ { "comment": "See https://github.com/zaproxy/zaproxy/pull/9218#pullrequestreview-3673685087", "path": "zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties", "hunk": "@@ -2901,9 +2901,9 @@ users.table.header.id = ID\n users.table.header.name = Name\n \n variant.options.excludedparam.dial...
true
zaproxy/zaproxy
9,332
comment_to_fix
Change title capitalization
See https://github.com/zaproxy/zaproxy/pull/9218#pullrequestreview-3673685087
a98cf3a053bd4ee64bcf86d8162f08d2266931a2
1d00e1e8b29f768e6fc1a71ed5a4f3b986e78668
diff --git a/zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties b/zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties index 27e83d872d2..948ffe96301 100644 --- a/zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties +++ b/zap/src/main/resources/org/zaproxy/zap/resources...
[ "zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties" ]
[ { "comment": "See https://github.com/zaproxy/zaproxy/pull/9218#pullrequestreview-3673685087", "path": "zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties", "hunk": "@@ -2901,9 +2901,9 @@ users.table.header.id = ID\n users.table.header.name = Name\n \n variant.options.excludedparam.dial...
true
zaproxy/zaproxy
9,338
issue_to_patch
Update dependencies
Bumps the gradle group with 6 updates: | Package | From | To | | --- | --- | --- | | org.apache.logging.log4j:log4j-api | `2.25.4` | `2.26.0` | | org.apache.logging.log4j:log4j-1.2-api | `2.25.4` | `2.26.0` | | org.apache.logging.log4j:log4j-core | `2.25.4` | `2.26.0` | | org.apache.logging.log4j:log4j-jul | `2.25.4` ...
a98cf3a053bd4ee64bcf86d8162f08d2266931a2
81d4e2b5714d87e710cf7f7d8593d3fc33da81b9
diff --git a/LEGALNOTICE.md b/LEGALNOTICE.md index 3746badacac..c1c6e142319 100644 --- a/LEGALNOTICE.md +++ b/LEGALNOTICE.md @@ -54,10 +54,10 @@ and subject to their respective licenses. | jfreechart-1.5.6.jar | LGPL | | jgrapht-core-0.9.2.jar | LGPL 2.1 ...
[ "LEGALNOTICE.md", "gradle/libs.versions.toml", "zap/src/main/java/org/zaproxy/zap/view/SplashScreen.java" ]
[]
true
zaproxy/zaproxy
9,328
issue_to_patch
httppanel: make setText undo atomically
`JTextComponent#setText` internally first removes existing text and then inserts new text, which causes two entries to be added to the undo history of RSyntaxTextArea. This means that hitting undo (ctrl/cmd + Z) in the Requester after sending a request, or after changing the HTTP method via the dropdown in the UI wa...
369b12f1b1ca19f6fb542ff2d280c905f38411a9
c853a3b1f043933870444efccd60fd098aa1b7f0
diff --git a/zap/src/main/java/org/zaproxy/zap/extension/httppanel/view/syntaxhighlight/HttpPanelSyntaxHighlightTextArea.java b/zap/src/main/java/org/zaproxy/zap/extension/httppanel/view/syntaxhighlight/HttpPanelSyntaxHighlightTextArea.java index 085ff633a6c..d60184f2808 100644 --- a/zap/src/main/java/org/zaproxy/zap/e...
[ "zap/src/main/java/org/zaproxy/zap/extension/httppanel/view/syntaxhighlight/HttpPanelSyntaxHighlightTextArea.java", "zap/src/testGui/java/org/zaproxy/zap/extension/httppanel/view/syntaxhighlight/HttpPanelSyntaxHighlightTextAreaGuiTest.java" ]
[]
true
zaproxy/zaproxy
9,330
issue_to_patch
Docker: Fix baseline path bug
64a5526274327dabf486138378a359f7ed2e6391
78cc75f4491f25fd28ed1fe737b5865010f00044
diff --git a/docker/CHANGELOG.md b/docker/CHANGELOG.md index df977bfedb2..0b3e990686c 100644 --- a/docker/CHANGELOG.md +++ b/docker/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog All notable changes to the docker containers will be documented in this file. +### 2026-05-08 +- Fixed bug in baseline scan which could result ...
[ "docker/CHANGELOG.md", "docker/zap-baseline.py" ]
[]
true
zaproxy/zaproxy
9,329
issue_to_patch
Actions: remove Bluesky alerts
The failures are now posted to a Slack channel, which all of the Core team can see
09ab9e71a4594d7bbdd8172927f1302bdcf18e22
28c349a586eec4b44e0cebf3df027d4d641a7328
diff --git a/.github/workflows/check-zap-errors.yml b/.github/workflows/check-zap-errors.yml index cf53d1992c7..d0d040912ba 100644 --- a/.github/workflows/check-zap-errors.yml +++ b/.github/workflows/check-zap-errors.yml @@ -23,13 +23,6 @@ jobs: # Pulls Nightly from GHCR docker run --rm -v $(pwd)/...
[ ".github/workflows/check-zap-errors.yml", ".github/workflows/run-integration-tests.yml" ]
[]
true
zaproxy/zaproxy
9,327
issue_to_patch
Update Gradle plugin org.sonarqube from 7.2.3.7755 to 7.3.0.8198
Bumps the gradle group with 1 update: org.sonarqube. Updates `org.sonarqube` from 7.2.3.7755 to 7.3.0.8198 [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.sonarqube&package-manager=gradle&previous-version=7.2.3.7755&new-version=7.3.0.8198)](ht...
d1c0d67ccdf54308d7992ccbbee441763a41d80e
19ef457edbf1ec1a9bf9aa45cdfb2cd33a3dcd1a
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index caa40e03c1b..3af67e44c35 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -51,6 +51,6 @@ cyclonedx.id = "org.cyclonedx.bom" dependencyUpdates = "com.github.ben-manes.versions:0.54.0" errorprone = "net.ltgt.errorprone:5.1...
[ "gradle/libs.versions.toml" ]
[]
true
zaproxy/zaproxy
9,325
issue_to_patch
Remove unused resource messages
The message `history.showresponse.popup` was added in b8dc3501d51a7e4a05e120b34d2fea178c61f765 but not actually used, likely related to commented code, which is being removed as well. The message `ascan.url.popup` stopped being referenced in c3de0fe0ff759807ca5a84fbcb6353813c6ae958 as the several context menus were ...
0df1822b55d7be412b77ce210e24f224477328b4
5702ca47b4ee8d941a4cfbd8ed78aa08a00b7fbb
diff --git a/zap/src/main/java/org/zaproxy/zap/extension/stdmenus/ExtensionStdMenus.java b/zap/src/main/java/org/zaproxy/zap/extension/stdmenus/ExtensionStdMenus.java index 3014e2a14a3..0299b0d1ca3 100644 --- a/zap/src/main/java/org/zaproxy/zap/extension/stdmenus/ExtensionStdMenus.java +++ b/zap/src/main/java/org/zapro...
[ "zap/src/main/java/org/zaproxy/zap/extension/stdmenus/ExtensionStdMenus.java", "zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties" ]
[]
true
zaproxy/zaproxy
9,321
issue_to_patch
Correct all active scan resumption through the API
## Summary Fix `ExtensionActiveScan.resumeAllScans()` to delegate to `ascanController.resumeAllScans()` instead of `ascanController.removeAllScans()`. ## Problem `resumeAllScans` was unintentionally removing all active scans instead of resuming paused ones. ## Root Cause Wrong controller method call in `Extens...
972ad356f0a1ccd142e1b46af847660cdef9f3a5
d01a052b405c5055744595691be90de771ced601
diff --git a/zap/src/main/java/org/zaproxy/zap/extension/ascan/ExtensionActiveScan.java b/zap/src/main/java/org/zaproxy/zap/extension/ascan/ExtensionActiveScan.java index c2ab80f3978..87b07c1110d 100644 --- a/zap/src/main/java/org/zaproxy/zap/extension/ascan/ExtensionActiveScan.java +++ b/zap/src/main/java/org/zaproxy/...
[ "zap/src/main/java/org/zaproxy/zap/extension/ascan/ExtensionActiveScan.java" ]
[]
true
zaproxy/zaproxy
9,319
issue_to_patch
Update dependencies
Bumps the gradle group with 3 updates: [commons-codec:commons-codec](https://github.com/apache/commons-codec), commons-io:commons-io and [xom:xom](https://github.com/elharo/xom). Updates `commons-codec:commons-codec` from 1.21.0 to 1.22.0 <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://gith...
90b2b48add9bb202d0ab9ec8981383c028f60e53
2b12ab100f58673d6225529e472cdb4c4ff16a28
diff --git a/LEGALNOTICE.md b/LEGALNOTICE.md index 23efba5d370..3746badacac 100644 --- a/LEGALNOTICE.md +++ b/LEGALNOTICE.md @@ -32,12 +32,12 @@ and subject to their respective licenses. | Library | License | |-------------------------------------|------------------------...
[ "LEGALNOTICE.md", "gradle/libs.versions.toml" ]
[]
true
zaproxy/zaproxy
9,307
issue_to_patch
Update dependencies
Bumps the gradle group with 22 updates: | Package | From | To | | --- | --- | --- | | [biz.aQute.bnd:biz.aQute.bnd.annotation](https://github.com/bndtools/bnd) | `7.1.0` | `7.2.3` | | [net.bytebuddy:byte-buddy](https://github.com/raphw/byte-buddy) | `1.18.0` | `1.18.8` | | [commons-codec:commons-codec](https://g...
1048d14b3db6a6f144c8a67dd904ef44c1d47e31
05b5369f62ece232e397d7e0f8cff95a9dc6d128
diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e945d01abfb..5473937fa5d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -25,3 +25,4 @@ updates: - dependency-name: "com.google.errorprone:error_prone_core" versions: [ ">= 2.43.0" ] # versions 2.43.x and later requir...
[ ".github/dependabot.yml", "LEGALNOTICE.md", "gradle/libs.versions.toml" ]
[]
true
zaproxy/zaproxy
9,318
issue_to_patch
Include PTK in nightly/weekly
708580f3ee3b46b3a443be6d821bef9462842dea
e7320ffb56b7f5d1ac526f878f00514d14dcd3ec
diff --git a/zap/src/main/weekly-add-ons.json b/zap/src/main/weekly-add-ons.json index c9007f43b70..7b5c84047ef 100644 --- a/zap/src/main/weekly-add-ons.json +++ b/zap/src/main/weekly-add-ons.json @@ -67,5 +67,8 @@ }, { "cloneUrl": "https://github.com/zaproxy/zap-hud.git" + }, + { + "cloneUrl": "https:/...
[ "zap/src/main/weekly-add-ons.json" ]
[]
true
zaproxy/zaproxy
9,315
issue_to_patch
Skip unwrap of `alertCountsByRisk`
Exclude `alert/alertCountsByRisk` from the unwrap as it's not wrapped in an object. Part of #9314.
2f9521871914e1ab3f10b273fcb2bd569ee10188
7d93c49a0653efd565fda660f312d56e91745186
diff --git a/zap/src/main/java/org/zaproxy/zap/extension/api/PythonAPIGenerator.java b/zap/src/main/java/org/zaproxy/zap/extension/api/PythonAPIGenerator.java index e349c0ab9a7..3d15e407250 100644 --- a/zap/src/main/java/org/zaproxy/zap/extension/api/PythonAPIGenerator.java +++ b/zap/src/main/java/org/zaproxy/zap/exten...
[ "zap/src/main/java/org/zaproxy/zap/extension/api/PythonAPIGenerator.java" ]
[]
true
zaproxy/zaproxy
9,296
issue_to_patch
Add task to generate the table of 3rd party libs
Allow to automatically generate the table of 3rd party libraries with their licenses. Add mapping between the coordinates and the licenses.
436aa59a0f722a2ba2a32d45183f478010073618
ea14de581b1c3b785729dcf0e932cd3d857cff60
diff --git a/buildSrc/src/main/java/org/zaproxy/zap/tasks/UpdateLegalNotice.java b/buildSrc/src/main/java/org/zaproxy/zap/tasks/UpdateLegalNotice.java new file mode 100644 index 00000000000..491701098de --- /dev/null +++ b/buildSrc/src/main/java/org/zaproxy/zap/tasks/UpdateLegalNotice.java @@ -0,0 +1,163 @@ +/* + * Zed...
[ "buildSrc/src/main/java/org/zaproxy/zap/tasks/UpdateLegalNotice.java", "zap/gradle/thirdPartyLicenses.yaml", "zap/zap.gradle.kts" ]
[]
true
zaproxy/zaproxy
9,300
issue_to_patch
Update project dependencies with dependabot
Change the dependabot configuration to update the project (Gradle) dependencies.
9472cd40a1c28189ba3033d2a916b59ea72e5d12
54f82c5a54d54ccf95953ac58ab57bfb296085f4
diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1b52049975f..e945d01abfb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,3 +9,19 @@ updates: applies-to: version-updates patterns: - "*" + - package-ecosystem: "gradle" + directory: "/" + exclude-...
[ ".github/dependabot.yml" ]
[ { "comment": "Is this indentation intentional/correct?\n\n![image](https://github.com/user-attachments/assets/f4cfac5b-69b5-4c8d-b4cc-d19d0dcb510b)", "path": ".github/dependabot.yml", "hunk": "@@ -9,3 +9,19 @@ updates:\n applies-to: version-updates\n patterns:\n - \"*\"\n+ - pac...
true
zaproxy/zaproxy
9,300
comment_to_fix
Update project dependencies with dependabot
Is this indentation intentional/correct? ![image](https://github.com/user-attachments/assets/f4cfac5b-69b5-4c8d-b4cc-d19d0dcb510b)
9472cd40a1c28189ba3033d2a916b59ea72e5d12
54f82c5a54d54ccf95953ac58ab57bfb296085f4
diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1b52049975f..e945d01abfb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,3 +9,19 @@ updates: applies-to: version-updates patterns: - "*" + - package-ecosystem: "gradle" + directory: "/" + exclude-...
[ ".github/dependabot.yml" ]
[ { "comment": "Is this indentation intentional/correct?\n\n![image](https://github.com/user-attachments/assets/f4cfac5b-69b5-4c8d-b4cc-d19d0dcb510b)", "path": ".github/dependabot.yml", "hunk": "@@ -9,3 +9,19 @@ updates:\n applies-to: version-updates\n patterns:\n - \"*\"\n+ - pac...
true
zaproxy/zaproxy
9,308
issue_to_patch
Bump the gha group with 3 updates
Bumps the gha group with 3 updates: [gradle/actions](https://github.com/gradle/actions), [docker/login-action](https://github.com/docker/login-action) and [docker/build-push-action](https://github.com/docker/build-push-action). Updates `gradle/actions` from 6.0.1 to 6.1.0 <details> <summary>Release notes</summary> <p>...
2d71d97708226c10472b10a1fce0c6ec00d4307c
ba4ed135b91244206c853a5375b7ffc4a25633ed
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e43f66637b0..02e999c0a68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,6 @@ jobs: with: distribution: 'temurin' java-version: ${{ matrix.java }} - - uses: gradle/actions/setup-g...
[ ".github/workflows/ci.yml", ".github/workflows/release-live-docker.yml", ".github/workflows/release-main-docker.yml", ".github/workflows/release-weekly-docker.yml", ".github/workflows/run-integration-tests.yml" ]
[]
true
zaproxy/zaproxy
9,299
issue_to_patch
Use version catalog
Simplify dependency management/updates.
884d3aa4ad5a23a0d177a31852f3ac1e5d397f04
778325199ba8e781f28c882230ce2ff0c0d5e350
diff --git a/build.gradle.kts b/build.gradle.kts index 3d1906212a1..a7769a364c3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,10 @@ import net.ltgt.gradle.errorprone.errorprone plugins { - id("com.diffplug.spotless") - id("org.sonarqube") version "6.0.1.5171" - id("com.github.ben-manes.v...
[ "build.gradle.kts", "gradle/libs.versions.toml", "zap/zap.gradle.kts" ]
[]
true
zaproxy/zaproxy
9,276
issue_to_patch
Handle exceptions of individual writers in MultipleWriters
**Problem** `MultipleWriters.close()` closes the underlying writers sequentially. If one `Writer.close()` throws an `IOException`, the method exits early and the remaining writers are never closed. **Fix** Update `close()` to attempt closing all writers, collect the first `IOException`, suppress subsequent close f...
6603ca5ec7d15c50a972ac92072b9c1b8df6f40c
dfb0d168908218e344714695798845aaa295a1fe
diff --git a/zap/src/main/java/org/zaproxy/zap/extension/script/MultipleWriters.java b/zap/src/main/java/org/zaproxy/zap/extension/script/MultipleWriters.java index 394bf8358fa..70f97a11a87 100644 --- a/zap/src/main/java/org/zaproxy/zap/extension/script/MultipleWriters.java +++ b/zap/src/main/java/org/zaproxy/zap/exten...
[ "zap/src/main/java/org/zaproxy/zap/extension/script/MultipleWriters.java", "zap/src/test/java/org/zaproxy/zap/extension/script/MultipleWritersUnitTest.java" ]
[ { "comment": "There's a preference in the codebase to use braces even for single statements.", "path": "zap/src/main/java/org/zaproxy/zap/extension/script/MultipleWriters.java", "hunk": "@@ -50,9 +50,16 @@ public void flush() throws IOException {\n \n @Override\n public void close() throws IOExc...
diff --git a/zap/src/test/java/org/zaproxy/zap/extension/script/MultipleWritersUnitTest.java b/zap/src/test/java/org/zaproxy/zap/extension/script/MultipleWritersUnitTest.java new file mode 100644 index 00000000000..cf5a8de7d1f --- /dev/null +++ b/zap/src/test/java/org/zaproxy/zap/extension/script/MultipleWritersUnitTes...
true
zaproxy/zaproxy
9,276
comment_to_fix
Handle exceptions of individual writers in MultipleWriters
There's a preference in the codebase to use braces even for single statements.
6603ca5ec7d15c50a972ac92072b9c1b8df6f40c
dfb0d168908218e344714695798845aaa295a1fe
diff --git a/zap/src/main/java/org/zaproxy/zap/extension/script/MultipleWriters.java b/zap/src/main/java/org/zaproxy/zap/extension/script/MultipleWriters.java index 394bf8358fa..70f97a11a87 100644 --- a/zap/src/main/java/org/zaproxy/zap/extension/script/MultipleWriters.java +++ b/zap/src/main/java/org/zaproxy/zap/exten...
[ "zap/src/main/java/org/zaproxy/zap/extension/script/MultipleWriters.java" ]
[ { "comment": "There's a preference in the codebase to use braces even for single statements.", "path": "zap/src/main/java/org/zaproxy/zap/extension/script/MultipleWriters.java", "hunk": "@@ -50,9 +50,16 @@ public void flush() throws IOException {\n \n @Override\n public void close() throws IOExc...
true
zaproxy/zaproxy
9,276
comment_to_fix
Handle exceptions of individual writers in MultipleWriters
Extract a method instead of triplicating the same logic.
6603ca5ec7d15c50a972ac92072b9c1b8df6f40c
dfb0d168908218e344714695798845aaa295a1fe
diff --git a/zap/src/main/java/org/zaproxy/zap/extension/script/MultipleWriters.java b/zap/src/main/java/org/zaproxy/zap/extension/script/MultipleWriters.java index 394bf8358fa..70f97a11a87 100644 --- a/zap/src/main/java/org/zaproxy/zap/extension/script/MultipleWriters.java +++ b/zap/src/main/java/org/zaproxy/zap/exten...
[ "zap/src/main/java/org/zaproxy/zap/extension/script/MultipleWriters.java" ]
[ { "comment": "Extract a method instead of triplicating the same logic.", "path": "zap/src/main/java/org/zaproxy/zap/extension/script/MultipleWriters.java", "hunk": "@@ -36,22 +36,58 @@ public class MultipleWriters extends Writer {\n @Override\n public void write(char[] cbuf, int off, int len) th...
true
zaproxy/zaproxy
9,293
issue_to_patch
Bump the gha group with 5 updates
Bumps the gha group with 5 updates: | Package | From | To | | --- | --- | --- | | [gradle/actions](https://github.com/gradle/actions) | `5.0.2` | `6.0.1` | | [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) | `3.7.0` | `4.0.0` | | [docker/setup-buildx-action](https://github.com/docker/setup-buil...
30e4f3d2f807ee62660c8b54a42ae793c0e78c0d
75036809ec554fb813e989226fd303ce55fe4d46
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ca9d22994a..e43f66637b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,6 +24,6 @@ jobs: with: distribution: 'temurin' java-version: ${{ matrix.java }} - - uses: gradle/actions/setup-g...
[ ".github/workflows/ci.yml", ".github/workflows/release-live-docker.yml", ".github/workflows/release-main-docker.yml", ".github/workflows/release-weekly-docker.yml", ".github/workflows/run-integration-tests.yml" ]
[]
true
zaproxy/zaproxy
9,287
issue_to_patch
Update localized resources
Update resources from Crowdin.
120a7bfc1d34a31928e83d7b68a92060f2891228
3724bbd0ee881c4c2105815cd48cbc531d65d803
diff --git a/zap/src/main/dist/lang/Messages_es_ES.properties b/zap/src/main/dist/lang/Messages_es_ES.properties index 92722aa2791..6ebf18512c0 100644 --- a/zap/src/main/dist/lang/Messages_es_ES.properties +++ b/zap/src/main/dist/lang/Messages_es_ES.properties @@ -598,7 +598,7 @@ ascan.scripts.type.active.desc = Los sc...
[ "zap/src/main/dist/lang/Messages_es_ES.properties" ]
[]
true
zaproxy/zaproxy
9,286
issue_to_patch
Change weekly to Java 21 and inc httpsInfo
c95f6abb4abcf95fa121a0d1ddc060125add274c
46525b5472314381267e89e27ad3ddb3f0e5df62
diff --git a/.github/workflows/release-weekly.yml b/.github/workflows/release-weekly.yml index 6785df736d8..6e35f2b00c6 100644 --- a/.github/workflows/release-weekly.yml +++ b/.github/workflows/release-weekly.yml @@ -18,7 +18,7 @@ jobs: uses: actions/setup-java@v5 with: distribution: 'temurin' - ...
[ ".github/workflows/release-weekly.yml", "zap/src/main/weekly-add-ons.json" ]
[]
true
zaproxy/zaproxy
9,192
issue_to_patch
Update localized resources
Update resources from Crowdin.
9fc7bf85eff43c7f59a625b3c553405fa09ce88a
acbb844882072f41729561a82f9e11dff1766280
diff --git a/zap/src/main/dist/lang/Messages_hi_IN.properties b/zap/src/main/dist/lang/Messages_hi_IN.properties index e9bc9c697c7..6190aad2fd8 100644 --- a/zap/src/main/dist/lang/Messages_hi_IN.properties +++ b/zap/src/main/dist/lang/Messages_hi_IN.properties @@ -111,7 +111,7 @@ alert.source.active = Active alert.sou...
[ "zap/src/main/dist/lang/Messages_hi_IN.properties", "zap/src/main/dist/lang/Messages_uk_UA.properties" ]
[]
true
zaproxy/zaproxy
9,284
issue_to_patch
Common Codec PR fixes
Merged https://github.com/zaproxy/zaproxy/pull/9282 to soon, so fixes for the outstanding comments
f407893c8a98ef64282a1e0fb9aa0c6662fca549
a64f81f886b0986332bbf6f6fd772a46e81d4cd4
diff --git a/LEGALNOTICE.md b/LEGALNOTICE.md index 2f8bfd62877..ee05ff2a85c 100644 --- a/LEGALNOTICE.md +++ b/LEGALNOTICE.md @@ -32,6 +32,7 @@ and subject to their respective licenses. | Library | License | |-------------------------------------|--------------------------...
[ "LEGALNOTICE.md", "buildSrc/build.gradle.kts", "buildSrc/src/main/java/org/zaproxy/zap/tasks/CreateGitHubRelease.java", "buildSrc/src/main/java/org/zaproxy/zap/tasks/HandleWeeklyRelease.java", "buildSrc/src/main/java/org/zaproxy/zap/tasks/UploadAssetsGitHubRelease.java", "buildSrc/src/main/java/org/zaprox...
[ { "comment": "Isn't this the same as the code is the other GitHub release class? De-dupe it?", "path": "buildSrc/src/main/java/org/zaproxy/zap/tasks/UploadAssetsGitHubRelease.java", "hunk": "@@ -185,21 +182,15 @@ private String updateChecksumsTable(String previousBody) throws IOException {\n ...
true
zaproxy/zaproxy
9,282
issue_to_patch
Remove Apache Commons Codec use
As per https://github.com/zaproxy/zap-extensions/pull/7207 It looks like core does not use commons Hex.
b8b05a5cd0a0e80e1e00ec33808b64b8be7d0920
ace1b87ba350463041029de68dfa9b72fa265865
diff --git a/LEGALNOTICE.md b/LEGALNOTICE.md index ee05ff2a85c..2f8bfd62877 100644 --- a/LEGALNOTICE.md +++ b/LEGALNOTICE.md @@ -32,7 +32,6 @@ and subject to their respective licenses. | Library | License | |-------------------------------------|--------------------------...
[ "LEGALNOTICE.md", "buildSrc/build.gradle.kts", "buildSrc/src/main/java/org/zaproxy/zap/tasks/CreateGitHubRelease.java", "buildSrc/src/main/java/org/zaproxy/zap/tasks/HandleWeeklyRelease.java", "buildSrc/src/main/java/org/zaproxy/zap/tasks/UploadAssetsGitHubRelease.java", "zap/src/main/java/org/apache/comm...
[ { "comment": "The dependency is still being included (it's a transitive dependency).", "path": "LEGALNOTICE.md", "hunk": "@@ -32,7 +32,6 @@ and subject to their respective licenses.\n | Library | License |\n |-------------------------------------|-----------...
true
zaproxy/zaproxy
9,282
comment_to_fix
Remove Apache Commons Codec use
The dependency is still being included (it's a transitive dependency).
b8b05a5cd0a0e80e1e00ec33808b64b8be7d0920
ace1b87ba350463041029de68dfa9b72fa265865
diff --git a/LEGALNOTICE.md b/LEGALNOTICE.md index ee05ff2a85c..2f8bfd62877 100644 --- a/LEGALNOTICE.md +++ b/LEGALNOTICE.md @@ -32,7 +32,6 @@ and subject to their respective licenses. | Library | License | |-------------------------------------|--------------------------...
[ "LEGALNOTICE.md" ]
[ { "comment": "The dependency is still being included (it's a transitive dependency).", "path": "LEGALNOTICE.md", "hunk": "@@ -32,7 +32,6 @@ and subject to their respective licenses.\n | Library | License |\n |-------------------------------------|-----------...
true
zaproxy/zaproxy
9,282
comment_to_fix
Remove Apache Commons Codec use
There was no need to change the build, this does not affect the dependencies of ZAP.
b8b05a5cd0a0e80e1e00ec33808b64b8be7d0920
ace1b87ba350463041029de68dfa9b72fa265865
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 16abd3db875..2ac59570ccb 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -24,7 +24,6 @@ tasks.withType<JavaCompile>().configureEach { dependencies { implementation("com.github.javaparser:javaparser-core:3.15.21") ...
[ "buildSrc/build.gradle.kts" ]
[ { "comment": "There was no need to change the build, this does not affect the dependencies of ZAP.", "path": "buildSrc/build.gradle.kts", "hunk": "@@ -24,7 +24,6 @@ tasks.withType<JavaCompile>().configureEach {\n dependencies {\n implementation(\"com.github.javaparser:javaparser-core:3.15.21\")\n ...
true
zaproxy/zaproxy
9,282
comment_to_fix
Remove Apache Commons Codec use
This should be done with chunks to prevent OOME, reading the whole file into memory is not good given the sizes the dist files have. The try catch only needs to wrap this statement not the whole append. (Same in other places)
b8b05a5cd0a0e80e1e00ec33808b64b8be7d0920
ace1b87ba350463041029de68dfa9b72fa265865
diff --git a/buildSrc/src/main/java/org/zaproxy/zap/tasks/CreateGitHubRelease.java b/buildSrc/src/main/java/org/zaproxy/zap/tasks/CreateGitHubRelease.java index ff941c74305..b469c974096 100644 --- a/buildSrc/src/main/java/org/zaproxy/zap/tasks/CreateGitHubRelease.java +++ b/buildSrc/src/main/java/org/zaproxy/zap/tasks/...
[ "buildSrc/src/main/java/org/zaproxy/zap/tasks/CreateGitHubRelease.java" ]
[ { "comment": "This should be done with chunks to prevent OOME, reading the whole file into memory is not good given the sizes the dist files have. The try catch only needs to wrap this statement not the whole append. (Same in other places)", "path": "buildSrc/src/main/java/org/zaproxy/zap/tasks/CreateGitHub...
true
zaproxy/zaproxy
9,282
comment_to_fix
Remove Apache Commons Codec use
- Preferable to copy verbatim the current code we are using and acknowledge that with a comment. - This needs to be moved after the encode method, the JavaDoc is now applying to this method.
b8b05a5cd0a0e80e1e00ec33808b64b8be7d0920
ace1b87ba350463041029de68dfa9b72fa265865
diff --git a/zap/src/main/java/org/apache/commons/httpclient/URI.java b/zap/src/main/java/org/apache/commons/httpclient/URI.java index 27657b1fd48..f8363194f61 100644 --- a/zap/src/main/java/org/apache/commons/httpclient/URI.java +++ b/zap/src/main/java/org/apache/commons/httpclient/URI.java @@ -39,8 +39,7 @@ import j...
[ "zap/src/main/java/org/apache/commons/httpclient/URI.java" ]
[ { "comment": "- Preferable to copy verbatim the current code we are using and acknowledge that with a comment.\r\n- This needs to be moved after the encode method, the JavaDoc is now applying to this method.", "path": "zap/src/main/java/org/apache/commons/httpclient/URI.java", "hunk": "@@ -1703,7 +1702,...
true
zaproxy/zaproxy
9,282
comment_to_fix
Remove Apache Commons Codec use
This class does not exist. Since we no longer want to use the codec classes we should disallow all imports like done with lang v2 (depending on what we do, if we end up removing it we can remove these rules).
b8b05a5cd0a0e80e1e00ec33808b64b8be7d0920
ace1b87ba350463041029de68dfa9b72fa265865
diff --git a/zap/zap.gradle.kts b/zap/zap.gradle.kts index 284781f2961..54aaf3a61b7 100644 --- a/zap/zap.gradle.kts +++ b/zap/zap.gradle.kts @@ -65,13 +65,19 @@ tasks.named<JacocoReport>("jacocoTestReport") { spotless { java { - bumpThisNumberIfACustomStepChanges(1) + bumpThisNumberIfACustomStepCh...
[ "zap/zap.gradle.kts" ]
[ { "comment": "This class does not exist. Since we no longer want to use the codec classes we should disallow all imports like done with lang v2 (depending on what we do, if we end up removing it we can remove these rules).", "path": "zap/zap.gradle.kts", "hunk": "@@ -65,13 +65,19 @@ tasks.named<JacocoRe...
true
zaproxy/zaproxy
9,282
comment_to_fix
Remove Apache Commons Codec use
This should be changed to implementation instead, to not expose it as a transitive dependency. Or, we should exclude in the respective direct dependency. In any case it's preferable to do first a full release without exposing the dependency but still including it to give time to third-party add-ons to act accordingly.
b8b05a5cd0a0e80e1e00ec33808b64b8be7d0920
ace1b87ba350463041029de68dfa9b72fa265865
diff --git a/zap/zap.gradle.kts b/zap/zap.gradle.kts index 284781f2961..54aaf3a61b7 100644 --- a/zap/zap.gradle.kts +++ b/zap/zap.gradle.kts @@ -65,13 +65,19 @@ tasks.named<JacocoReport>("jacocoTestReport") { spotless { java { - bumpThisNumberIfACustomStepChanges(1) + bumpThisNumberIfACustomStepCh...
[ "zap/zap.gradle.kts" ]
[ { "comment": "This should be changed to implementation instead, to not expose it as a transitive dependency. Or, we should exclude in the respective direct dependency. In any case it's preferable to do first a full release without exposing the dependency but still including it to give time to third-party add-on...
true