Fix the bug of dataflow with ID OpenCSGs/csghub-dataflow#80、OpenCSGs/csghub-dataflow#83

Author: zhanglongbin

label_studio/core/views.py

@@ -282,20 +282,10 @@ def collect_metrics(request):
 def system_config(request):
     """Proxy endpoint to fetch system config from external API"""
     try:
-        # 从session或请求参数中获取origin
-        origin = request.session.get('origin') or request.GET.get('origin')
-
-        # 构建API URL
-        if origin:
-            # 确保origin以/结尾，然后拼接接口路径
-            origin = origin.rstrip('/')
-            api_url = f"{origin}/internal_api/system_config"
-        else:
-            # 如果没有origin，使用默认URL
-            api_url = 'https://opencsg.com/internal_api/system_config'
-
         # 调用外部API
-        response = requests.get(api_url)
+        response = requests.get(
+            'https://opencsg-stg.com/internal_api/system_config'
+        )
         response.raise_for_status()
 
         # 返回JSON响应

label_studio/log/label_studio.log

@@ -222,11 +222,12 @@ def reset_token(self) -> Token:
 
     def get_initials(self, is_deleted=False):
         initials = '?'
-
+        print(self.user_name)
         if is_deleted:
             return 'DU'
-
-        if not self.first_name and not self.last_name:
+        if  self.user_name :
+            initials = self.user_name[0:2]
+        elif self.first_name and not self.last_name:
             initials = self.email[0:2]
         elif self.first_name and not self.last_name:
             initials = self.first_name[0:1]

label_studio/users/models.py

@@ -445,9 +445,6 @@ def login_reques(request):
     # 将语言保存到session中
     request.session['language'] = language
     origin = request.GET.get('origin')  # 获取origin参数
-    # 将origin保存到session中，供后续接口使用
-    if origin:
-        request.session['origin'] = origin
     user = request.user
     # 设置默认重定向页面
     if not next_page or not url_has_allowed_host_and_scheme(url=next_page, allowed_hosts=request.get_host()):

label_studio/users/views.py

@@ -103,6 +103,18 @@ export const Menubar = ({
   const contextItem = menubarClass.elem("context-item");
   const showNewsletterDot = !isDefined(user?.allow_newsletters);
 
+  // 获取用户显示名称：优先使用user_name，其次username，最后邮箱
+  const userDisplayName = useMemo(() => {
+    if (!user) return "";
+    if (user.user_name) {
+      return user.user_name;
+    }
+    if (user.username) {
+      return user.username;
+    }
+    return user.email || "";
+  }, [user]);
+
   const handleLanguageChange = useCallback((lang) => {
     i18n.changeLanguage(lang);
     langMenuRef.current?.close();
@@ -363,14 +375,14 @@ export const Menubar = ({
               </Menu>
             }
           >
-            <div title={user?.email} className={menubarClass.elem("user")}>
+            <div title={userDisplayName} className={menubarClass.elem("user")}>
               <Userpic user={user} isInProgress={isInProgress} />
               {showNewsletterDot && (
                 <div className={menubarClass.elem("userpic-badge")} />
               )}
             </div>
           </Dropdown.Trigger> */}
-          <div title={user?.email} className={menubarClass.elem("user")}>
+          <div title={userDisplayName} className={menubarClass.elem("user")}>
             <Userpic user={user} isInProgress={isInProgress} />
             {showNewsletterDot && (
               <div className={menubarClass.elem("userpic-badge")} />

web/apps/labelstudio/src/components/Menubar/Menubar.jsx

@@ -481,7 +481,65 @@
       "Simple object detection": "Simple object detection",
       "Sample config to label with bboxes": "Sample config to label with bboxes",
       "You can configure labels and their colors": "You can configure labels and their colors",
-      "Select label and click on image to start": "Select label and click on image to start"
+      "Select label and click on image to start": "Select label and click on image to start",
+      "Speech Transcription": "Speech Transcription",
+      "Signal Quality Detection": "Signal Quality Detection",
+      "Automatic Speech Recognition": "Automatic Speech Recognition",
+      "Sound Event Detection": "Sound Event Detection",
+      "Automatic Speech Recognition using Segments": "Automatic Speech Recognition using Segments",
+      "Speaker Segmentation": "Speaker Segmentation",
+      "Intent Classification": "Intent Classification",
+      "Conversational Analysis": "Conversational Analysis",
+      "Intent Classification and Slot Filling": "Intent Classification and Slot Filling",
+      "Response Generation": "Response Generation",
+      "Response Selection": "Response Selection",
+      "Coreference Resolution & Entity Linking": "Coreference Resolution & Entity Linking",
+      "Chatbot Model Assessment": "Chatbot Model Assessment",
+      "LLM Response Grading": "LLM Response Grading",
+      "Supervised Language Model Fine-tuning": "Supervised Language Model Fine-tuning",
+      "Visual Ranker": "Visual Ranker",
+      "Human Preference collection for RLHF": "Human Preference collection for RLHF",
+      "LLM Ranker": "LLM Ranker",
+      "Question Answering": "Question Answering",
+      "Content Moderation": "Content Moderation",
+      "Text Classification": "Text Classification",
+      "Relation Extraction": "Relation Extraction",
+      "Taxonomy": "Taxonomy",
+      "Machine Translation": "Machine Translation",
+      "Text Summarization": "Text Summarization",
+      "Named Entity Recognition": "Named Entity Recognition",
+      "Pairwise classification": "Pairwise classification",
+      "ASR Hypotheses Selection": "ASR Hypotheses Selection",
+      "Text-to-Image Generation": "Text-to-Image Generation",
+      "Pairwise regression": "Pairwise regression",
+      "Document Retrieval": "Document Retrieval",
+      "Content-based Image Retrieval": "Content-based Image Retrieval",
+      "Search Page Ranking": "Search Page Ranking",
+      "Time Series Forecasting": "Time Series Forecasting",
+      "Activity Recognition": "Activity Recognition",
+      "Signal Quality": "Signal Quality",
+      "Change Point Detection": "Change Point Detection",
+      "Outliers & Anomaly Detection": "Outliers & Anomaly Detection",
+      "HTML Entity Recognition": "HTML Entity Recognition",
+      "Tabular Data": "Tabular Data",
+      "PDF Classification": "PDF Classification",
+      "Freeform Metadata": "Freeform Metadata",
+      "Video Object Tracking": "Video Object Tracking",
+      "Video Frame Classification": "Video Frame Classification",
+      "Video Classification": "Video Classification",
+      "Video Timeline Segmentation": "Video Timeline Segmentation",
+      "Keypoint Labeling": "Keypoint Labeling",
+      "Inventory Tracking": "Inventory Tracking",
+      "Image Classification": "Image Classification",
+      "Semantic Segmentation with Masks": "Semantic Segmentation with Masks",
+      "Optical Character Recognition": "Optical Character Recognition",
+      "Visual Genome": "Visual Genome",
+      "Semantic Segmentation with Polygons": "Semantic Segmentation with Polygons",
+      "Visual Question Answering": "Visual Question Answering",
+      "Medical Image Classification with Bounding Boxes": "Medical Image Classification with Bounding Boxes",
+      "Image Captioning": "Image Captioning",
+      "Object Detection with Bounding Boxes": "Object Detection with Bounding Boxes",
+      "Multi-page document annotation": "Multi-page document annotation"
     },
     "uiPreview": "UI Preview"
   },

web/apps/labelstudio/src/locales/en.json

@@ -481,7 +481,65 @@
       "Simple object detection": "简单目标检测",
       "Sample config to label with bboxes": "使用边界框标注的示例配置",
       "You can configure labels and their colors": "您可以配置标签及其颜色",
-      "Select label and click on image to start": "选择标签并点击图像开始"
+      "Select label and click on image to start": "选择标签并点击图像开始",
+      "Speech Transcription": "语音转录",
+      "Signal Quality Detection": "信号质量检测",
+      "Automatic Speech Recognition": "自动语音识别",
+      "Sound Event Detection": "声音事件检测",
+      "Automatic Speech Recognition using Segments": "基于片段的自动语音识别",
+      "Speaker Segmentation": "说话人分割",
+      "Intent Classification": "意图分类",
+      "Conversational Analysis": "对话分析",
+      "Intent Classification and Slot Filling": "意图分类与槽填充",
+      "Response Generation": "回复生成",
+      "Response Selection": "回复选择",
+      "Coreference Resolution & Entity Linking": "共指消解与实体链接",
+      "Chatbot Model Assessment": "聊天机器人模型评估",
+      "LLM Response Grading": "大语言模型回复评分",
+      "Supervised Language Model Fine-tuning": "监督式语言模型微调",
+      "Visual Ranker": "视觉排序器",
+      "Human Preference collection for RLHF": "人类偏好收集（用于RLHF）",
+      "LLM Ranker": "大语言模型排序器",
+      "Question Answering": "问答",
+      "Content Moderation": "内容审核",
+      "Text Classification": "文本分类",
+      "Relation Extraction": "关系抽取",
+      "Taxonomy": "分类法",
+      "Machine Translation": "机器翻译",
+      "Text Summarization": "文本摘要",
+      "Named Entity Recognition": "命名实体识别",
+      "Pairwise classification": "成对分类",
+      "ASR Hypotheses Selection": "ASR假设选择",
+      "Text-to-Image Generation": "文本到图像生成",
+      "Pairwise regression": "成对回归",
+      "Document Retrieval": "文档检索",
+      "Content-based Image Retrieval": "基于内容的图像检索",
+      "Search Page Ranking": "搜索结果页排序",
+      "Time Series Forecasting": "时间序列预测",
+      "Activity Recognition": "活动识别",
+      "Signal Quality": "信号质量",
+      "Change Point Detection": "变化点检测",
+      "Outliers & Anomaly Detection": "异常值检测",
+      "HTML Entity Recognition": "HTML实体识别",
+      "Tabular Data": "表格数据",
+      "PDF Classification": "PDF分类",
+      "Freeform Metadata": "自由格式元数据",
+      "Video Object Tracking": "视频目标跟踪",
+      "Video Frame Classification": "视频帧分类",
+      "Video Classification": "视频分类",
+      "Video Timeline Segmentation": "视频时间线分割",
+      "Keypoint Labeling": "关键点标注",
+      "Inventory Tracking": "库存跟踪",
+      "Image Classification": "图像分类",
+      "Semantic Segmentation with Masks": "基于掩码的语义分割",
+      "Optical Character Recognition": "光学字符识别",
+      "Visual Genome": "视觉基因组",
+      "Semantic Segmentation with Polygons": "基于多边形的语义分割",
+      "Visual Question Answering": "视觉问答",
+      "Medical Image Classification with Bounding Boxes": "医学图像分类（带边界框）",
+      "Image Captioning": "图像字幕生成",
+      "Object Detection with Bounding Boxes": "目标检测（带边界框）",
+      "Multi-page document annotation": "多页文档标注"
     },
     "uiPreview": "界面预览"
   },

web/apps/labelstudio/src/locales/zh.json

@@ -1,4 +1,4 @@
-import { renderHook, act } from "@testing-library/react-hooks";
+import { renderHook, act } from "@testing-library/react";
 import { usePersistentState, usePersistentJSONState } from "./usePersistentState";
 
 describe("usePersistentState", () => {

web/libs/core/src/lib/hooks/usePersistentState.test.ts

@@ -68,7 +68,13 @@ export const Userpic = forwardRef(
     }
 
     const displayName = useMemo(() => {
-      return userDisplayName(user ?? userRef.current);
+      const curUser = user ?? userRef.current;
+      // 优先使用 user_name 字段
+      if (curUser?.user_name) {
+        return curUser.user_name;
+      }
+      // 如果没有 user_name，使用 userDisplayName 作为后备
+      return userDisplayName(curUser);
     }, [user]);
 
     const background = useMemo(() => {