siat 3.7.28__py3-none-any.whl → 3.8.1__py3-none-any.whl

siat/translate.py

@@ -4646,6 +4646,8 @@ if __name__ == '__main__':
     text='Accounts Receivable Net of Sales Allowance'
     text='Accounts Payable'
     
+    text='经济形势分析：China, in Trillions'
+    
     language_detect=True
     language_engine=['google','baidu','bing']
     
@@ -4661,11 +4663,26 @@ if __name__ == '__main__':
     lang_auto2(engtext2)
 
 
-def lang_auto2(text,language_detect=True,language_engine=['alibaba','google','bing','sogou']):
+def auto_translate(text,translate=False,language_engine=['bing','sogou','alibaba','google']):
+    """
+    ===========================================================================
+    功能：基于translate决定是否翻译text
+    
+    注意：可以通过调整language_engine更换翻译引擎，不同的翻译引擎更有特色
+    谷歌的翻译引擎总体质量较好，但对财经术语的翻译较差
+    阿里巴巴的翻译引擎对长句翻译不错，但翻译结果不稳定，对同一术语的翻译不稳定
+    搜狗的翻译引擎处理中英文混合时容易出错
+    """
+    new_text=text
+    if translate:
+        new_text=lang_auto2(text,language_engine=language_engine)
+    return new_text
+
+def lang_auto2(text,language_detect=True,language_engine=['bing','alibaba','google','sogou']):
     '''转换字符串text至当前语言环境，基于translators，可指定翻译服务器，准确度更高'''
     
     import translators as ts
-    
+    """
     lang_env=check_language()
     
     if language_detect:
@@ -4674,16 +4691,51 @@ def lang_auto2(text,language_detect=True,language_engine=['alibaba','google','bi
         #字符串语言与当前环境语言相同，无需翻译，节省运行时间
         if lang_env==lang_text:
             return text
+    """
+    # 检查翻译方向
+    lang_env=check_language()
+    if lang_env in ['English']:
+        target_lang="en"
+        source_lang="zh"
+    else:
+        target_lang="zh"
+        source_lang="en"
+
+    if isinstance(language_engine,str):
+        language_engine=[language_engine]
     
     success=False
+    for le in language_engine:
+        try:
+            translation = ts.translate_text(text, \
+                                            from_language=source_lang,to_language=target_lang, \
+                                            translator=le)
+            
+            # 去掉中文中的所有空格
+            if target_lang=="zh":
+                translation = translation.replace(' ','')
+                
+            success=True
+            break
+        except:
+            continue
+    
+    """
     if lang_env=='Chinese':
         #translator支持baidu/bing/google
-        if isinstance(language_engine,str):
-            language_engine=[language_engine]
             
         for le in language_engine:
             try:
                 translation = ts.translate_text(text,from_language='en',to_language='zh', translator=le)
+                
+                # 应对搜狗引擎中英文混合时可能的翻译错乱
+                if le in ['sogou']:
+                    lang_text=detect_language(translation)
+                    if lang_text != lang_env:
+                        text=translation
+                        translation = ts.translate_text(text,from_language='en',to_language='zh', translator=le)
+                # 去掉中文中的所有空格
+                translation = translation.replace(' ','')
                 success=True
                 break
             except:
@@ -4698,6 +4750,7 @@ def lang_auto2(text,language_detect=True,language_engine=['alibaba','google','bi
                 continue
     else:
         return text
+    """
     
     if not success:
         translation = text
@@ -4725,13 +4778,22 @@ def detect_language(text):
     
     if total_count == 0:
         result='Unknown'
-        
+    
+    """    
     if chinese_count > english_count:
         result='Chinese'
     elif english_count > chinese_count:
         result='English'
     else:
         result='Both'    
+    """
+    if chinese_count==0 and english_count>0:
+        result='English'
+    if chinese_count>0 and english_count==0:
+        result='Chinese'
+    if chinese_count>0 and english_count>0:
+        result='Both'
+        
     
     return result
 
@@ -4865,6 +4927,219 @@ def words_split_yahoo(text,split_improve=True):
         
     return text_new3
 
+#==============================================================================
+if __name__ == '__main__':
+    text="经济趋势分析：GDP PPP (constant international $)"
+    
+    source_lang="en"
+    target_lang="zh"
+    content_tip="宏观经济学与金融学"
+    content_tip="美国上市公司财务报表"
+    content_tip="香港上市公司财务报表"
+
+def kimi_translate(text, source_lang="zh", target_lang="en", \
+                   domain_tip="宏观经济学与金融学", \
+                   terminology_tip="特别注意专业术语内涵翻译的专业性", \
+                   special_tip="仅翻译文本，不翻译专业术语缩写词，不附带原文，不解释内容"):
+    """
+    ===========================================================================
+    功能：使用 Kimi API 进行翻译。
+    :param api_key: Kimi API 密钥
+    :param text: 要翻译的文本
+    :param source_lang: 源语言，默认为自动检测
+    :param target_lang: 目标语言，默认为英文
+    :return: 翻译结果
+    """
+    
+    if target_lang=="en":
+        target_lang="英文"
+        source_lang="中文"
+    else:
+        target_lang="中文"
+        source_lang="英文"
+    
+    import requests
+    # 如果api_key失效，可重新申请，或付费购买
+    api_key='sk-BMuqBuuYr6Hh6Ihi1SL2Vbfr7B3868QQSbTVExgalMpoYfA3'
+    
+    url = "https://api.moonshot.cn/v1/chat/completions"  # Kimi API 的 URL
+    headers = {
+        "Content-Type": "application/json",
+        "Authorization": f"Bearer {api_key}"
+    }
+    
+    payload = {
+        "model": "moonshot-v1-8k",
+        "messages": [
+            {
+                "role": "system",
+                "content": f"将以下{domain_tip}文本从{source_lang}翻译为{target_lang}，{terminology_tip}，{special_tip}："
+            },
+            {
+                "role": "user",
+                "content": text
+            }
+        ]
+    }
+
+    response = requests.post(url, json=payload, headers=headers)
+    if response.status_code == 200:
+        result = response.json()
+        return result["choices"][0]["message"]["content"]
+    else:
+        """
+        import time; time.sleep(3)
+        # 再试一次
+        response = requests.post(url, json=payload, headers=headers)
+        if response.status_code == 200:
+            result = response.json()
+            return result["choices"][0]["message"]["content"]
+        else:
+            return f"Error: {response.status_code}"
+        """
+        return f"Error: {response.status_code}"
+    
+        
+if __name__ == '__main__':
+    text = "这是一段需要翻译的中文文本。"
+    kimi_translate(text, source_lang="zh", target_lang="en")
+    
+    text = "经济趋势分析：Japan, in Trillions" 
+    text = "GDP PPP (constant LCU)"
+    text = "Broad money (% of GDP)"
+    kimi_translate(text, source_lang="en", target_lang="zh",content_tip="宏观经济学与金融学")
+    
+    #翻译财报项目：将需要翻译的短语集合在一起，一次性调用翻译，可提高效率，之后再拆分使用
+    #最好使用句号分割，避免AI联系上下文进行翻译
+    text = "DilutedEPS.Debt Service Coverage.ROIC.periodType.BasicEPS.Equity Multiplier.Treasury Shares Number"
+    text="Total Equity And Minority Interest.Total non Current Liabilities Net of Minority Interest"
+    
+    kimi_translate(text, source_lang="en", target_lang="zh",domain_tip="雅虎财经财务报表")
+
+#==============================================================================
+if __name__ == '__main__':
+    # 英译中
+    text_list=["GDP PPP (constant international $)","Broad money"]
+    source_lang="en"; target_lang="zh"
+    domain_tip="宏观经济学与金融学"
+    terminology_tip="特别注意专业术语内涵翻译的专业性"
+    special_tip="特别注意只翻译文本即可，不用附带原文，不用解释内容"
+    
+    translate_list(text_list,source_lang, target_lang)
+    
+    # 英译中
+    text_list=["投资收益率","投资风险"]
+    source_lang="zh"; target_lang="en"
+    
+    translate_list(text_list,source_lang, target_lang)
+    
+def translate_list(text_list=["GDP PPP","Broad money"],source_lang="auto", target_lang="en", \
+                   domain_tip="宏观经济学与金融学", \
+                   terminology_tip="特别注意专业术语内涵翻译的专业性", \
+                   special_tip="特别注意只翻译文本即可，不用附带原文，不用解释内容"):
+    """
+    ===========================================================================
+    功能：翻译列表中的内容，并按原顺序输出翻译后的列表
+    主要参数：
+    
+    """
+    # 检查列表是否为空
+    if len(text_list)==0: return text_list
+    
+    # 将列表合成为长字符串，使用句点做分隔符
+    text=''; first=True
+    separator_en='.'; separator_zh='。'
+    for t in text_list:
+        if first:
+            text=t
+            first=False
+        else:
+            text=text+separator_en+t
+            
+    # 一次性翻译
+    translated=kimi_translate(text, source_lang=source_lang, target_lang=target_lang, \
+                       domain_tip=domain_tip, \
+                       terminology_tip=terminology_tip, \
+                       special_tip=special_tip)
+    
+    import re
+    if target_lang=='zh':
+        # 拆分：第1步
+        text1=re.split(r'\n|。',translated)
+        
+        # 拆分：第2步
+        text2=[]
+        for t in text1:
+            t1=t.split('：')
+            t2=t1[0]
+            """
+            if len(t1)==1: t2=t1[0]
+            else: t2=t1[1]
+            """
+            text2=text2+[t2]
+            
+    if target_lang=='en':
+         # 拆分：第1步
+        text1=translated.split('.')
+         
+        # 拆分：第2步
+        text2=[]
+        for t in text1:
+            t1=t.split('：')
+            t2=t1[0]
+            """
+            if len(t1)==1: t2=t1[0]
+            else: t2=t1[1]
+            """
+            text2=text2+[t2]
+           
+            
+    return text2
+
+        
+#==============================================================================
+if __name__ == '__main__':
+    text="经济趋势分析：GDP PPP (constant international $)"
+    text="经济趋势分析：GDP PPP"
+    text="经济趋势分析：Japan"
+    
+    auto_translate2(text,translate=True)
+    
+def auto_translate2(text,translate=False, \
+                    domain_tip="经济学与金融学", \
+                    terminology_tip="特别注意专业术语内涵翻译的专业性", \
+                    special_tip="特别注意只翻译文本即可，不用附带原文，不用解释内容"):
+    """
+    ===========================================================================
+    功能：基于translate决定是否翻译text
+    
+    注意：可以通过调整_tip改善翻译质量
+    """
+    if not translate: return text
+    
+    # 检查翻译方向
+    lang_env=check_language()
+    if lang_env in ['English']:
+        target_lang="en"
+        source_lang="zh"
+    else:
+        target_lang="zh"
+        source_lang="en"
+    
+    new_text=text
+    if translate:
+        new_text=kimi_translate(text, source_lang=source_lang, target_lang=target_lang, \
+                           domain_tip=domain_tip, \
+                           terminology_tip=terminology_tip, \
+                           special_tip=special_tip)
+            
+    if 'Error' in new_text or '429' in new_text:
+        new_text=auto_translate(text,translate=True)
+            
+    return new_text
+
+#==============================================================================
+#==============================================================================
 #==============================================================================
 #==============================================================================
 #==============================================================================

{siat-3.7.28.dist-info → siat-3.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: siat
-Version: 3.7.28
+Version: 3.8.1
 Summary: Securities Investment Analysis Tools (siat)
 Home-page: https://pypi.org/project/siat/
 Author: Prof. WANG Dehong, International Business School, Beijing Foreign Studies University

{siat-3.7.28.dist-info → siat-3.8.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 siat/__init__ -20240701.py,sha256=gP5uajXnJesnH5SL0ZPwq_Qhv59AG1bs4qwZv26Fo2Y,2894
-siat/__init__.py,sha256=tX_xClvPr3TZ8t7WlUMFJnceRCQSseGnq1szeRjck8Q,1813
+siat/__init__.py,sha256=N2D1ydfh_lejim0z6eQR17utNF7-5lk04c1esGO71_E,2223
 siat/__init__.py.backup_20250214.py,sha256=pIo4CV3lNPKIhitmhIh_6aAfZrmzQWGNDcEnvZ7GXoc,3216
-siat/allin.py,sha256=x1QC29PUBUYiA6IAbQKbRvtxIEUOBx8dy5k7zh1ABT4,2970
+siat/allin.py,sha256=9xwa97S6KPHXGuqDtyN9b6Y4lCSM1VdBqpFBrlRvV8I,3001
 siat/alpha_vantage_test.py,sha256=tKr-vmuFH3CZAqwmISz6jzjPHzV1JJl3sPfZdz8aTfM,747
 siat/assets_liquidity.py,sha256=o_UZdLs693uNWPEQB2OzxDH0mdWimOmq4qe_vx1pue0,28987
 siat/assets_liquidity_test.py,sha256=UWk6HIUlizU7LQZ890fGx8LwU1jMMrIZswg8cFUJWZ8,1285
@@ -19,7 +19,7 @@ siat/capm_beta.py,sha256=cxXdRVBQBllhbfz1LeTJAIWvyRYhW54nhtNUXv4HwS0,29063
 siat/capm_beta2.py,sha256=-ZYYp1HK7SkfTR3vBKZ0QVC4Q_tbST2O4MGbX_V77J0,32031
 siat/capm_beta_test.py,sha256=ImR0c5mc4hIl714XmHztdl7qg8v1E2lycKyiqnFj6qs,1745
 siat/cmat_commons.py,sha256=Nj9Kf0alywaztVoMVeVVL_EZk5jRERJy8R8kBw88_Tg,38116
-siat/common.py,sha256=IkeZU6i-F0cv7pnrMtZjYUegk1B2jaD_ULmLD_SJZv0,179357
+siat/common.py,sha256=Qum_mU7AbjA_7VLH7P8EeqpIB2UwVfYxB8XNHuOHseo,180273
 siat/compare_cross.py,sha256=3iP9TH2h3w27F2ARZc7FjKcErYCzWRc-TPiymOyoVtw,24171
 siat/compare_cross_test.py,sha256=xra5XYmQGEtfIZL2h-GssdH2hLdFIhG3eoCrkDrL3gY,3473
 siat/concepts_iwencai.py,sha256=m1YEDtECRT6FqtzlKm91pt2I9d3Z_XoP59BtWdRdu8I,3061
@@ -30,6 +30,7 @@ siat/cryptocurrency_test.py,sha256=3AikTNJ7j-HwLGLIYEfyXZ3bLVuLeru9mwiwHQi2SdA,2
 siat/derivative.py,sha256=qV8n09799eqLc26ojR6vN5n_X-xd7rGwdYjgq-wBih8,41483
 siat/economy-20230125.py,sha256=vxZZlPnLkh7SpGMVEPLwxjt0yYLSVmdZrO-s2NYLyoM,73848
 siat/economy.py,sha256=BFVQDxOTbuizyumpCgpZIauH6sqnwUXebpqRMmQCzys,84198
+siat/economy2.py,sha256=hZJUvavyX6RQxmmrsjMMKCSlnwdHLwNhLSUkBTLitko,37491
 siat/economy_test.py,sha256=6vjNlPz7W125pJb7simCddobSEp3jmLIMvVkLRZ7zW8,13339
 siat/esg.py,sha256=GMhaonIKtvOK83rhpQUH5aJt2OL3HQBSVfD__Yw-0oo,19040
 siat/esg_test.py,sha256=Z9m6GUt8O7oHZSEG9aDYpGdvvrv2AiRJdHTiU6jqmZ0,2944
@@ -63,7 +64,7 @@ siat/future_china.py,sha256=F-HsIf2Op8Z22RzTjet1g8COzldgnMjFNSXsAkeGyWo,17595
 siat/future_china_test.py,sha256=BrSzmDVaOHki6rntOtosmRn-6dkfOBuLulJNqh7MOpc,1163
 siat/global_index_test.py,sha256=hnFp3wqqzzL-kAP8mgxDZ54Bd5Ijf6ENi5YJlGBgcXw,2402
 siat/google_authenticator.py,sha256=ZUbZR8OW0IAKDbcYtlqGqIpZdERpFor9NccFELxg9yI,1637
-siat/grafix.py,sha256=-ewwyFBXP4qbe7HY9RGowtfC3zXb-DkByIdqMj2k_C0,110457
+siat/grafix.py,sha256=GECIZoILBtzV6zf7J8MTHMs0Iy25okbwvuIIPY-vOuc,115280
 siat/grafix_test.py,sha256=kXvcpLgQNO7wd30g_bWljLj5UH7bIVI0_dUtXbfiKR0,3150
 siat/holding_risk.py,sha256=G3wpaewAKF9CwEqRpr4khyuDu9SU2EGyQUHdk7cmHOA,30693
 siat/holding_risk_test.py,sha256=FRlw_9wFG98BYcg_cSj95HX5WZ1TvkGaOUdXD7-V86s,474
@@ -97,7 +98,7 @@ siat/risk_evaluation.py,sha256=I6B3gty-t--AkDCO0tKF-291YfpnF-IkXcFjqNKCt9I,76286
 siat/risk_evaluation_test.py,sha256=YEXM96gKzTfwN4U61AS4Rr1tV7KgUvn4rRC6f3iMw9s,3731
 siat/risk_free_rate.py,sha256=IBuRqA2kppdZsW4D4fapW7vnM5HMEXOn95A5r9Pkwlo,12384
 siat/risk_free_rate_test.py,sha256=CpmhUf8aEAEZeNu4gvWP2Mz2dLoIgBX5bI41vfUBEr8,4285
-siat/sector_china.py,sha256=L58_8aDPZ54GbIm7-Oxg0pEdQ3hha6pJIah82pYzS8c,155147
+siat/sector_china.py,sha256=cWa5EiSDX7E7w_XCDNOBgxtim474ayYMDfPkVex8fFA,155257
 siat/sector_china_test.py,sha256=1wq7ef8Bb_L8F0h0W6FvyBrIcBTEbrTV7hljtpj49U4,5843
 siat/security_price.py,sha256=2oHskgiw41KMGfqtnA0i2YjNNV6cYgtlUK0j3YeuXWs,29185
 siat/security_price2.py,sha256=dYwvz9H-uWp-Gyc1g_MId9k8cITS6ZHmjW-Fc2ypp-0,26587
@@ -108,7 +109,7 @@ siat/security_trend2-20240620.py,sha256=QVnEcb7AyVbO77jVqfFsJffGXrX8pgJ9xCfoAKmW
 siat/security_trend2.py,sha256=Pp2a2HtiVa1P1S1hW8DfMcXcbbnAsvkL7rlTdct67AQ,30242
 siat/setup.py,sha256=up65rQGLmTBkhtaMLowjoQXYmIsnycnm4g1SYmeQS6o,1335
 siat/shenwan index history test.py,sha256=JCVAzOSEldHalhSFa3pqD8JI_8_djPMQOxpkuYU-Esg,1418
-siat/stock.py,sha256=JT_sq-9B8A25fzTh7rSj5-NnO2IlGbI_7O47ZZu9Dk0,159068
+siat/stock.py,sha256=NPy2zPVMZtblY66VY2hAb9YNy7xQFjyP0YjcfWrb9_w,159068
 siat/stock_advice_linear.py,sha256=-twT7IGP-NEplkL1WPSACcNJjggRB2j4mlAQCkzOAuo,31655
 siat/stock_base.py,sha256=uISvbRyOGy8p9QREA96CVydgflBkn5L3OXOGKl8oanc,1312
 siat/stock_china.py,sha256=85Ggb21E2mrCYMdSSTTrkoyyLGXMK2V-BtlweHomSRg,93460
@@ -134,7 +135,7 @@ siat/transaction_test.py,sha256=Z8g1LJCN4-mnUByXMUMoFmN0t105cbmsz2QmvSuIkbU,1858
 siat/translate-20230125.py,sha256=NPPSXhT38s5t9fzMvl_fvi4ckSB73ThLmZetVI-xGdU,117953
 siat/translate-20230206.py,sha256=-vtI125WyaJhmPotOpDAmclt_XnYVaWU9ByLWZ6FyYE,118133
 siat/translate-20230215.py,sha256=TJgtPE3n8IjljmZ4Pefy8dmHoNdFF-1zpML6BhA9FKE,121657
-siat/translate.py,sha256=lIT0MO9QwhGaHipDK0p7_evOJN3e5wwKlCqv8Vebvto,251987
+siat/translate.py,sha256=Xg5lq_rwKKrt8Ysz84LhwLu276KYl1-Nfqq84jRfl7w,262241
 siat/translate_20240606.py,sha256=63IyHWEU3Uz9mjwyuAX3fqY4nUMdwh0ICQAgmgPXP7Y,215121
 siat/translate_241003_keep.py,sha256=un7Fqe1v35MXsja5exZgjmLzrZtt66NARZIGlyFuGGU,218747
 siat/universal_test.py,sha256=CDAOffW1Rvs-TcNN5giWVvHMlch1w4dp-w5SIV9jXL0,3936
@@ -143,8 +144,8 @@ siat/valuation_china.py,sha256=CVp1IwIsF3Om0J29RGkyxZLt4n9Ug-ua_RKhLwL9fUQ,69624
 siat/valuation_market_china_test.py,sha256=gbJ0ioauuo4koTPH6WKUkqcXiQPafnbhU5eKJ6lpdLA,1571
 siat/var_model_validation.py,sha256=R0caWnuZarrRg9939hxh3vJIIpIyPfvelYmzFNZtPbo,14910
 siat/yf_name.py,sha256=laNKMTZ9hdenGX3IZ7G0a2RLBKEWtUQJFY9CWuk_fp8,24058
-siat-3.7.28.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
-siat-3.7.28.dist-info/METADATA,sha256=4kVtKwGVnpVtaWBWbl0PuPiWcclWxuzhtt3ndREUq7o,8321
-siat-3.7.28.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-siat-3.7.28.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
-siat-3.7.28.dist-info/RECORD,,
+siat-3.8.1.dist-info/LICENSE,sha256=NTEMMROY9_4U1szoKC3N2BLHcDd_o5uTgqdVH8tbApw,1071
+siat-3.8.1.dist-info/METADATA,sha256=ofydAqYklStHxKyPE6-Eo-P5QjT4IAvsHBt5E9Ogupg,8320
+siat-3.8.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+siat-3.8.1.dist-info/top_level.txt,sha256=r1cVyL7AIKqeAmEJjNR8FMT20OmEzufDstC2gv3NvEY,5
+siat-3.8.1.dist-info/RECORD,,