langfun 0.1.2.dev202501060804__py3-none-any.whl → 0.1.2.dev202501090804__py3-none-any.whl

langfun/core/llms/openai.py

@@ -553,26 +553,31 @@ class GptO1(OpenAI):
 
   model = 'o1'
   multimodal = True
+  timeout = None
 
 
 class GptO1Preview(OpenAI):
   """GPT-O1."""
   model = 'o1-preview'
+  timeout = None
 
 
 class GptO1Preview_20240912(OpenAI):   # pylint: disable=invalid-name
   """GPT O1."""
   model = 'o1-preview-2024-09-12'
+  timeout = None
 
 
 class GptO1Mini(OpenAI):
   """GPT O1-mini."""
   model = 'o1-mini'
+  timeout = None
 
 
 class GptO1Mini_20240912(OpenAI):   # pylint: disable=invalid-name
   """GPT O1-mini."""
   model = 'o1-mini-2024-09-12'
+  timeout = None
 
 
 class Gpt4(OpenAI):

langfun/core/llms/vertexai.py

@@ -90,6 +90,8 @@ class VertexAI(gemini.Gemini):
       )
 
     self._project = project
+    self._location = location
+
     credentials = self.credentials
     if credentials is None:
       # Use default credentials.
@@ -114,9 +116,10 @@ class VertexAI(gemini.Gemini):
 
   @property
   def api_endpoint(self) -> str:
+    assert self._api_initialized
     return (
-        f'https://{self.location}-aiplatform.googleapis.com/v1/projects/'
-        f'{self.project}/locations/{self.location}/publishers/google/'
+        f'https://{self._location}-aiplatform.googleapis.com/v1/projects/'
+        f'{self._project}/locations/{self._location}/publishers/google/'
         f'models/{self.model}:generateContent'
     )
 
@@ -126,6 +129,7 @@ class VertexAIGeminiFlash2_0ThinkingExp_20241219(VertexAI):  # pylint: disable=i
 
   api_version = 'v1alpha'
   model = 'gemini-2.0-flash-thinking-exp-1219'
+  timeout = None
 
 
 class VertexAIGeminiFlash2_0Exp(VertexAI):  # pylint: disable=invalid-name

langfun/core/llms/vertexai_test.py

@@ -41,7 +41,7 @@ class VertexAITest(unittest.TestCase):
     os.environ['VERTEXAI_LOCATION'] = 'us-central1'
     model = vertexai.VertexAIGeminiPro1()
     self.assertTrue(model.model_id.startswith('VertexAI('))
-    self.assertIsNotNone(model.api_endpoint)
+    self.assertIn('us-central1', model.api_endpoint)
     self.assertTrue(model._api_initialized)
     self.assertIsNotNone(model._session)
     del os.environ['VERTEXAI_PROJECT']

langfun/core/structured/mapping.py

@@ -46,15 +46,15 @@ class MappingError(Exception):  # pylint: disable=g-bad-exception-name
     r = io.StringIO()
     error_message = str(self.cause).rstrip()
     r.write(
-        lf.colored(
+        pg.colored(
             f'{self.cause.__class__.__name__}: {error_message}', 'magenta'
         )
     )
     if include_lm_response:
       r.write('\n\n')
-      r.write(lf.colored('[LM Response]', 'blue', styles=['bold']))
+      r.write(pg.colored('[LM Response]', 'blue', styles=['bold']))
       r.write('\n')
-      r.write(lf.colored(self.lm_response.text, 'blue'))
+      r.write(pg.colored(self.lm_response.text, 'blue'))
     return r.getvalue()
 
 
@@ -163,27 +163,27 @@ class MappingExample(lf.NaturalLanguageFormattable,
   def natural_language_format(self) -> str:
     result = io.StringIO()
     if self.context:
-      result.write(lf.colored('[CONTEXT]\n', styles=['bold']))
-      result.write(lf.colored(self.context, color='magenta'))
+      result.write(pg.colored('[CONTEXT]\n', styles=['bold']))
+      result.write(pg.colored(self.context, color='magenta'))
       result.write('\n\n')
 
-    result.write(lf.colored('[INPUT]\n', styles=['bold']))
-    result.write(lf.colored(self.input_repr(), color='green'))
+    result.write(pg.colored('[INPUT]\n', styles=['bold']))
+    result.write(pg.colored(self.input_repr(), color='green'))
 
     if self.schema is not None:
       result.write('\n\n')
-      result.write(lf.colored('[SCHEMA]\n', styles=['bold']))
-      result.write(lf.colored(self.schema_repr(), color='red'))
+      result.write(pg.colored('[SCHEMA]\n', styles=['bold']))
+      result.write(pg.colored(self.schema_repr(), color='red'))
 
     if schema_lib.MISSING != self.output:
       result.write('\n\n')
-      result.write(lf.colored('[OUTPUT]\n', styles=['bold']))
-      result.write(lf.colored(self.output_repr(), color='blue'))
+      result.write(pg.colored('[OUTPUT]\n', styles=['bold']))
+      result.write(pg.colored(self.output_repr(), color='blue'))
 
     if self.metadata:
       result.write('\n\n')
-      result.write(lf.colored('[METADATA]\n', styles=['bold']))
-      result.write(lf.colored(str(self.metadata), color='cyan'))
+      result.write(pg.colored('[METADATA]\n', styles=['bold']))
+      result.write(pg.colored(str(self.metadata), color='cyan'))
     return result.getvalue().strip()
 
   @classmethod

langfun/core/structured/mapping_test.py

@@ -29,11 +29,11 @@ class MappingErrorTest(unittest.TestCase):
         lf.AIMessage('hi'), ValueError('Cannot parse message.')
     )
     self.assertEqual(
-        lf.text_formatting.decolored(str(error)),
+        pg.decolor(str(error)),
         'ValueError: Cannot parse message.\n\n[LM Response]\nhi',
     )
     self.assertEqual(
-        lf.text_formatting.decolored(error.format(include_lm_response=False)),
+        pg.decolor(error.format(include_lm_response=False)),
         'ValueError: Cannot parse message.',
     )
 

langfun/core/structured/schema.py

@@ -91,20 +91,25 @@ class SchemaError(Exception):   # pylint: disable=g-bad-exception-name
   def __str__(self):
     r = io.StringIO()
     r.write(
-        lf.colored(f'{self.cause.__class__.__name__}: {self.cause}', 'magenta'))
+        pg.colored(
+            f'{self.cause.__class__.__name__}: {self.cause}', 'magenta'
+        )
+    )
 
     r.write('\n')
-    r.write(lf.colored('Schema:', 'red'))
+    r.write(pg.colored('Schema:', 'red'))
     r.write('\n\n')
     r.write(textwrap.indent(
-        lf.colored(schema_repr(self.protocol).repr(self.schema), 'magenta'),
+        pg.colored(
+            schema_repr(self.protocol).repr(self.schema), 'magenta'
+        ),
         ' ' * 2
     ))
     r.write('\n\n')
-    r.write(lf.colored('Generated value:', 'red'))
+    r.write(pg.colored('Generated value:', 'red'))
     r.write('\n\n')
     r.write(textwrap.indent(
-        lf.colored(value_repr(self.protocol).repr(self.value), 'magenta'),
+        pg.colored(value_repr(self.protocol).repr(self.value), 'magenta'),
         ' ' * 2
     ))
     return r.getvalue()
@@ -759,12 +764,15 @@ class JsonError(Exception):
   def __str__(self) -> str:
     r = io.StringIO()
     r.write(
-        lf.colored(f'{self.cause.__class__.__name__}: {self.cause}', 'magenta'))
+        pg.colored(
+            f'{self.cause.__class__.__name__}: {self.cause}', 'magenta'
+        )
+    )
 
     r.write('\n\n')
-    r.write(lf.colored('JSON text:', 'red'))
+    r.write(pg.colored('JSON text:', 'red'))
     r.write('\n\n')
-    r.write(textwrap.indent(lf.colored(self.json, 'magenta'), ' ' * 2))
+    r.write(textwrap.indent(pg.colored(self.json, 'magenta'), ' ' * 2))
     return r.getvalue()
 
 

{langfun-0.1.2.dev202501060804.dist-info → langfun-0.1.2.dev202501090804.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: langfun
-Version: 0.1.2.dev202501060804
+Version: 0.1.2.dev202501090804
 Summary: Langfun: Language as Functions.
 Home-page: https://github.com/google/langfun
 Author: Langfun Authors
@@ -56,6 +56,17 @@ Requires-Dist: pillow>=10.0.0; extra == "mime-pil"
 Provides-Extra: mime-xlsx
 Requires-Dist: openpyxl>=3.1.0; extra == "mime-xlsx"
 Requires-Dist: pandas>=2.0.3; extra == "mime-xlsx"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 <div align="center">
 <img src="https://raw.githubusercontent.com/google/langfun/main/docs/_static/logo.svg" width="520px" alt="logo"></img>

{langfun-0.1.2.dev202501060804.dist-info → langfun-0.1.2.dev202501090804.dist-info}/RECORD

@@ -1,15 +1,15 @@
 langfun/__init__.py,sha256=fhfPXpHN7GoGqixpFfqhQkYxFs_siP_LhbjZhd3lhio,2497
-langfun/core/__init__.py,sha256=oboXhlpA93wk4p1K52-tx0pbBt49r6Y1aCmiavBV03Y,4830
+langfun/core/__init__.py,sha256=1fHngxhnpxYaVzNMPnifU2JXKaC4LdJGTGp0VnbaXUo,4580
 langfun/core/component.py,sha256=HVrEoTL1Y01iqOHC3FYdbAOnffqfHHtGJXoK1vkdEwo,11583
 langfun/core/component_test.py,sha256=sG-T2wpvBfHqWGZE7sc4NayJj2aj5QFBzSwFiwrGEIc,10376
-langfun/core/concurrent.py,sha256=QMNYhB_PyjvVJtabMokpzotZRYvyE9iYu2QsgwDk7M4,29552
+langfun/core/concurrent.py,sha256=zhZX-YpByUKXWwarlDZFfY8TMW4r71jSW_wDlLhB980,29485
 langfun/core/concurrent_test.py,sha256=ILlAjfhV84yJfY1QLe3N9aYry1sCjY-ywfIlXGafenI,17336
-langfun/core/console.py,sha256=Fra2_MSWZbFh6rY8HZoYgpGLsrNvhaGuL03znOwQbhM,2529
+langfun/core/console.py,sha256=bGwuJZRs_9NNKY1KmJjIZLeoQ_fL0BikAJPLDVdp1hw,2558
 langfun/core/console_test.py,sha256=pBOcuNMJdVELywvroptfcRtJMsegMm3wSlHAL2TdxVk,1679
 langfun/core/langfunc.py,sha256=G50YgoVZ0y1GFw2ev41MlOqr6qa8YakbvNC0h_E0PiA,11140
 langfun/core/langfunc_test.py,sha256=fKIAqcSNI_7M6nwoZW77HEam8Oa6vcWhsCNgVJanzb4,8822
-langfun/core/language_model.py,sha256=b15MZ_qbydnz5vQ09t7sf9tc3C7qWvMSxUrGfT0p99I,33827
-langfun/core/language_model_test.py,sha256=hnYhtw7GM_TbhgsJzHNYTaoDewUlPHpOVlI7xEkCFuI,31783
+langfun/core/language_model.py,sha256=lQFHIEAHMNZtKNQ5tG6Gb74dGcfvy5mA4eeftYhnEOg,33881
+langfun/core/language_model_test.py,sha256=lFPXBcxofvvL6u5GEpAAbsPxIDmk0Wy038SQ_mBIOz8,32153
 langfun/core/logging.py,sha256=W3mLEMXdo210Q5OX3a1ZTc4nU-xMy73-IfNKnsA-RFo,8051
 langfun/core/logging_test.py,sha256=N7-YvSXC8zvnr2SNwWHOykn1CFmqvIuTLDgn41Ku9JU,6642
 langfun/core/memory.py,sha256=f-asN1F7Vehgdn_fK84v73GrEUOxRtaW934keutTKjk,2416
@@ -25,8 +25,6 @@ langfun/core/subscription.py,sha256=euawEuSZP-BHydaT-AQpfYFL0m5pWPGcW0upFhrojqc,
 langfun/core/subscription_test.py,sha256=Y4ZdbZEwm83YNZBxHff0QR4QUa4rdaNXA3_jfIcArBo,8717
 langfun/core/template.py,sha256=jNhYSrbLIn9kZOa03w5QZbyjgfnzJzE_ZrrMvvWY4t4,24929
 langfun/core/template_test.py,sha256=g7x4mgNIAXEEj-4W1D5whGfl5YikLEQoylKPzaeDomk,17069
-langfun/core/text_formatting.py,sha256=d7t9vaY6aCn1dkfkikpNYnBy5E_i93vHbfyDWFclGZU,5284
-langfun/core/text_formatting_test.py,sha256=ck0Xzdd4YF4CtCUj7VE0GybfbAyKQ8p3xkM1FBGrqIk,2096
 langfun/core/agentic/__init__.py,sha256=ndoDX0sAYsa3eVdXuu6nB-a-BH5TaK3urW6zAaFiyVs,1110
 langfun/core/agentic/action.py,sha256=yW5-2NRHIrQmmQEYmL83aIdSwaRfUez9mqCbME_aBWQ,25391
 langfun/core/agentic/action_eval.py,sha256=ZtjTh34S7XPIUqandQ0YwAtzw-S7ofuZ7rRXnRbUMdQ,4424
@@ -34,20 +32,20 @@ langfun/core/agentic/action_eval_test.py,sha256=tRUkWmOE9p0rpNOq19xAY2oDEnYsEEyk
 langfun/core/agentic/action_test.py,sha256=Gu7P5XQvzqbKawn2jjyTpWaARzzhzO04KkC1TuBnUnw,4612
 langfun/core/coding/__init__.py,sha256=5utju_fwEsImaiftx4oXKl9FAM8p281k8-Esdh_-m1w,835
 langfun/core/coding/python/__init__.py,sha256=MJ-vubliz-ebrZH3OBRKBwMi0S9-FrhGCp8YQLR6_I4,1776
-langfun/core/coding/python/correction.py,sha256=cg5intTKlx7Lr4VGU-qc90_qF2nuat1mpIAcGj-JmNw,7018
+langfun/core/coding/python/correction.py,sha256=SR_ZP8MYqvipFi5Scsl_5FYzBRRTwRehig79r67ZdlM,7129
 langfun/core/coding/python/correction_test.py,sha256=qGxXuHaO32onF6cAoTfO1_sH_lM7-3dE9UqaaU8Myxs,4215
-langfun/core/coding/python/errors.py,sha256=fX3Du63uGm25YFXW9D-bV2gntTdTAX3hBFtAnRlmg14,3166
+langfun/core/coding/python/errors.py,sha256=KDn0bJH-34dUM5fp3Ocgn3HvWg1XYgFnxCSiWXGNI1c,3162
 langfun/core/coding/python/errors_test.py,sha256=_ZbWJCFIb-FkCK7K1zCuH8W3x_NFt-jNe3dfP8yqaD4,2323
-langfun/core/coding/python/execution.py,sha256=raZix62g2fwt6Lgykll2DFzkLlEjVqN9E73q0iaVdak,10185
-langfun/core/coding/python/execution_test.py,sha256=lExY6GMLeuCsCKXgM2KbAPJ6kqSlfHmz3RG0-dqfVcI,7197
-langfun/core/coding/python/generation.py,sha256=xivSeOKGN00HnG1TLuFhPfP-JyRuRrSELxVJW2ngqIQ,7750
+langfun/core/coding/python/execution.py,sha256=vf8AzDcL_9xh-kpTKWywt9gV7Pc8KLghOHj6hrpiqS8,10762
+langfun/core/coding/python/execution_test.py,sha256=xBsk5OZuuEY1_w7dxu25akL-NVHm02xjzyOQ2rPWhgY,7693
+langfun/core/coding/python/generation.py,sha256=MqzoFdB3v7BtrAzqIMMyH8RvqaNJ6TSqZ9Xw-iPmPTI,8427
 langfun/core/coding/python/generation_test.py,sha256=54bgKr1DgzYFLoqR8bTn7Yjol0gPCuR6XvRltR4l6YM,2777
 langfun/core/coding/python/parsing.py,sha256=LMg8REP4VDY0YQjtPAGNAW4rKlMNdSXF8m19wMT9yrY,7128
 langfun/core/coding/python/parsing_test.py,sha256=9vAWF484kWIm6JZq8NFiMgKUDhXV-deRl1QMmNERfAA,7386
 langfun/core/coding/python/permissions.py,sha256=1QWGHvzL8MM0Ok_auQ9tURqZHtdOfJaDpBzZ29GUE-c,2544
 langfun/core/coding/python/permissions_test.py,sha256=w5EDb8QxpxgJyZkojyzVWQvDfg366zn99-g__6TbPQ0,2699
 langfun/core/eval/__init__.py,sha256=OEXr1ZRuvLuhJJfuQ1ZWQ-SvYzjyrtiAAEogYaB7E6o,1933
-langfun/core/eval/base.py,sha256=ajHUS_BdzBIDKEwAmMzne0lJi8HcDhPmyw_plO0p7G0,75814
+langfun/core/eval/base.py,sha256=XXerMVkK4wREo7K1_aCyay6vDjw3mfs389XThAdzv50,75768
 langfun/core/eval/base_test.py,sha256=-LsIV9DXlDal0EnOlaWpibJvfef0NbxtZAm0OH_abAE,27189
 langfun/core/eval/matching.py,sha256=AVKkGoc-BaHEzgSBamaAk3194TgqckDe_dinpS6LrXI,9323
 langfun/core/eval/matching_test.py,sha256=QCoYEuf4b_1bkHqUCuRzKMbXHrV3AB2FCOBivo1stC4,5249
@@ -73,31 +71,33 @@ langfun/core/eval/v2/progress.py,sha256=azZgssQgNdv3IgjKEaQBuGI5ucFDNbdi02P4z_nQ
 langfun/core/eval/v2/progress_test.py,sha256=YU7VHzmy5knPZwj9vpBN3rQQH2tukj9eKHkuBCI62h8,2540
 langfun/core/eval/v2/progress_tracking.py,sha256=l9fEkz4oP5McpZzf72Ua7PYm3lAWtRru7gRWNf8H0ms,6083
 langfun/core/eval/v2/progress_tracking_test.py,sha256=fouMVJkFJqHjbhQJngGLGCmA9x3n0dU4USI2dY163mg,2291
-langfun/core/eval/v2/reporting.py,sha256=obYPQma5k4K3jxTmV8UXigJnQZvWfxUENBwoa-29JSk,8265
+langfun/core/eval/v2/reporting.py,sha256=QOp5jX761Esvi5w_UIRLDqPY_XRO6ru02-DOrdqVK_4,8392
 langfun/core/eval/v2/reporting_test.py,sha256=UmYSAQvD3AIXsSyWQ-WD2uLtEISYpmBeoKY5u5Qwc8E,5696
 langfun/core/eval/v2/runners.py,sha256=DKEmSlGXjOXKWFdBhTpLy7tMsBHZHd1Brl3hWIngsSQ,15931
 langfun/core/eval/v2/runners_test.py,sha256=A37fKK2MvAVTiShsg_laluJzJ9AuAQn52k7HPbfD0Ks,11666
-langfun/core/llms/__init__.py,sha256=hzddKJKI7NsqGXXyV3Q2jhB95A0TTpBIAhKrACICkk0,6519
+langfun/core/llms/__init__.py,sha256=AvKRIryNNDgL3fchzNp25NPh95ojI5lOnT8XHaJS_BE,6639
 langfun/core/llms/anthropic.py,sha256=a5MmnFsBA0CbfvwzXT1v_0fqLRMrhUNdh1tx6469PQ4,14357
 langfun/core/llms/anthropic_test.py,sha256=-2U4kc_pgBM7wqxu8RuxzyHPGww1EAWqKUvN4PW8Btw,8058
 langfun/core/llms/compositional.py,sha256=csW_FLlgL-tpeyCOTVvfUQkMa_zCN5Y2I-YbSNuK27U,2872
 langfun/core/llms/compositional_test.py,sha256=4eTnOer-DncRKGaIJW2ZQQMLnt5r2R0UIx_DYOvGAQo,2027
+langfun/core/llms/deepseek.py,sha256=HxdLFFar5Mh01kKMyoLGnoYciACwxe2UzSpvKtXbSyw,8471
+langfun/core/llms/deepseek_test.py,sha256=Eo-FFyW8PWeFH-AbfY6Ib2MARnFlMtEtPIJ86DsTyz4,14856
 langfun/core/llms/fake.py,sha256=gCHBYBLvBCsC78HI1hpoqXCS-p1FMTgY1P1qh_sGBPk,3070
 langfun/core/llms/fake_test.py,sha256=2h13qkwEz_JR0mtUDPxdAhQo7MueXaFSwsD2DIRDW9g,7653
 langfun/core/llms/gemini.py,sha256=tfM4vrt0WnvnrxRhWXZWh7Gp8dYYfMnSbi9uOstkSak,17399
 langfun/core/llms/gemini_test.py,sha256=2ERhYWCJwnfDTQbCaZHFuB1TdWJFrOBS7yyCBInIdQk,6129
-langfun/core/llms/google_genai.py,sha256=p19jTO3D-wNUIxDcLwypgGpTCjvwQxqxCMBoPjtaetM,3645
+langfun/core/llms/google_genai.py,sha256=85Vmx5QmsziON03PRsFQINSu5NF6pAAuFFhUdDteWGc,3662
 langfun/core/llms/google_genai_test.py,sha256=JZf_cbQ4GGGpwiQCLjFJn7V4jxBBqgZhIx91AzbGKVo,1250
 langfun/core/llms/groq.py,sha256=dCnR3eAECEKuKKAAj-PDTs8NRHl6CQPdf57m1f6a79U,10312
 langfun/core/llms/groq_test.py,sha256=GYF_Qtq5S1H1TrKH38t6_lkdroqT7v-joYLDKnmS9e0,5274
 langfun/core/llms/llama_cpp.py,sha256=9tXQntSCDtjTF3bnyJrAPCr4N6wycy5nXYvp9uduygE,2843
 langfun/core/llms/llama_cpp_test.py,sha256=MWO_qaOeKjRniGjcaWPDScd7HPaIJemqUZoslrt4FPs,1806
-langfun/core/llms/openai.py,sha256=dLDVBB47nJ30XCwjJpAZMc55ZlZXB__PcfcICCRNuXQ,20995
+langfun/core/llms/openai.py,sha256=g5X_ySW-b2f0uRE8sb3_W1sAB-pWpKLNNoflBoRBwrc,21080
 langfun/core/llms/openai_test.py,sha256=kOWa1nf-nJvtYY10REUw5wojh3ZgfU8tRaCZ8wUgJbA,16623
 langfun/core/llms/rest.py,sha256=sWbYUV8S3SuOg9giq7xwD-xDRfaF7NP_ig7bI52-Rj4,3442
 langfun/core/llms/rest_test.py,sha256=NZ3Nf0XQVpT9kLP5cBVo_yBHLI7vWTYhWQxYEJVMGs4,3472
-langfun/core/llms/vertexai.py,sha256=D9pC-zNRTZ4LDZeV_tjP_c8y3JaGQxTOXpp8VIthwCI,5420
-langfun/core/llms/vertexai_test.py,sha256=KqQkJpjZvpqp-JmDK2yTYK_XyLIyizzb4EeTHfUV8sk,1779
+langfun/core/llms/vertexai.py,sha256=MuwLPTJ6-9x2uRDCSM1_biPK6M76FFlL1ezf5OmobDA,5504
+langfun/core/llms/vertexai_test.py,sha256=iXjmQs7TNiwcueoaRGpdp4KnASkDJaTP__Z9QroN8zQ,1787
 langfun/core/llms/cache/__init__.py,sha256=QAo3InUMDM_YpteNnVCSejI4zOsnjSMWKJKzkb3VY64,993
 langfun/core/llms/cache/base.py,sha256=rt3zwmyw0y9jsSGW-ZbV1vAfLxQ7_3AVk0l2EySlse4,3918
 langfun/core/llms/cache/in_memory.py,sha256=i58oiQL28RDsq37dwqgVpC2mBETJjIEFS20yHiV5MKU,5185
@@ -125,13 +125,13 @@ langfun/core/structured/description.py,sha256=6BztYOiucPkF4CrTQtPLPJo1gN2dwnKmaJ
 langfun/core/structured/description_test.py,sha256=UxaXnKKP7TnyPDPUyf3U-zPE0TvLlIP6DGr8thjcePw,7365
 langfun/core/structured/function_generation.py,sha256=g7AOR_e8HxFU6n6Df750aGkgMgV1KExLZMAz0yd5Agg,8555
 langfun/core/structured/function_generation_test.py,sha256=LaXYDXf9GlqUrR6v_gtmK_H4kxzonmU7SYbn7XXMgjU,12128
-langfun/core/structured/mapping.py,sha256=vLKH79UT-j0qkQdvqlQBO7SkXXuM-yr2Idm8_HH8qwM,13649
-langfun/core/structured/mapping_test.py,sha256=bHm2ZCXBITq_G8Lvw_olFHeUUc4s_lGXZm9v9JhoPB4,9630
+langfun/core/structured/mapping.py,sha256=of-EeBq0RgmkiUaSk2rVEDVCzgn_wXU8tRke7NCcC6E,13649
+langfun/core/structured/mapping_test.py,sha256=OntYvfDitAf0tAnzQty3YS90vyEn6FY1Mi93r_ViEk8,9594
 langfun/core/structured/parsing.py,sha256=MGvI7ypXlwfzr5XB8_TFU9Ei0_5reYqkWkv64eAy0EA,12015
 langfun/core/structured/parsing_test.py,sha256=kNPrhpdPY3iWhUld0TFYU-Zgn44wC0d6YuQ9XdVbQ8o,22346
 langfun/core/structured/querying.py,sha256=nqvsfMS_KLv5EvO0_VAGEHwY4pHy4S0CvJmeV0HBXlM,23066
 langfun/core/structured/querying_test.py,sha256=YlC4s9LVChfhGZzaXGW1UYlcBnAjNOunu4SLl5_p7PQ,32054
-langfun/core/structured/schema.py,sha256=0VUPSfX1JEQ0xu8WvEymCKK_WSGwBNA-rQD2hATErmU,27912
+langfun/core/structured/schema.py,sha256=_iqhHEGDQsHk0AsybWnK44sOspTWkKJjci781PWD7x0,27988
 langfun/core/structured/schema_generation.py,sha256=U3nRQsqmMZg_qIVDh2fiY3K4JLfsAL1LcKzIFP1iXFg,5316
 langfun/core/structured/schema_generation_test.py,sha256=RM9s71kMNg2jTePwInkiW9fK1ACN37eyPeF8OII-0zw,2950
 langfun/core/structured/schema_test.py,sha256=RjYhwTgktQgyqAjzLvo967nTiIK9KWgP-aNGg4e7ihE,25258
@@ -148,8 +148,8 @@ langfun/core/templates/demonstration.py,sha256=vCrgYubdZM5Umqcgp8NUVGXgr4P_c-fik
 langfun/core/templates/demonstration_test.py,sha256=SafcDQ0WgI7pw05EmPI2S4v1t3ABKzup8jReCljHeK4,2162
 langfun/core/templates/selfplay.py,sha256=yhgrJbiYwq47TgzThmHrDQTF4nDrTI09CWGhuQPNv-s,2273
 langfun/core/templates/selfplay_test.py,sha256=Ot__1P1M8oJfoTp-M9-PQ6HUXqZKyMwvZ5f7yQ3yfyM,2326
-langfun-0.1.2.dev202501060804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202501060804.dist-info/METADATA,sha256=3MbJlnp-TmGrXXb9jhRPLd7g86sm9b2zDXLWIWMkkZA,7941
-langfun-0.1.2.dev202501060804.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-langfun-0.1.2.dev202501060804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202501060804.dist-info/RECORD,,
+langfun-0.1.2.dev202501090804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202501090804.dist-info/METADATA,sha256=mzbVRkRzSywU6qRzqZJ5KeGgTUGpYjMepZqt6OJtMJw,8172
+langfun-0.1.2.dev202501090804.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+langfun-0.1.2.dev202501090804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202501090804.dist-info/RECORD,,

{langfun-0.1.2.dev202501060804.dist-info → langfun-0.1.2.dev202501090804.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.7.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

langfun/core/text_formatting.py

@@ -1,168 +0,0 @@
-# Copyright 2023 The Langfun Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""Utility library for LM input/output formatting."""
-
-import io
-import re
-from typing import Any
-
-try:
-  import termcolor      # pylint: disable=g-import-not-at-top
-except ImportError:
-  termcolor = None
-
-
-# Regular expression for ANSI color characters.
-_ANSI_COLOR_REGEX = re.compile(r'\x1b\[[0-9;]*m')
-
-
-def decolored(text: str) -> str:
-  """Return the de-colored string that may contains ANSI color characters."""
-  return re.sub(_ANSI_COLOR_REGEX, '', text)
-
-
-def colored(
-    text: str,
-    color: str | None = None,
-    background: str | None = None,
-    styles: list[str] | None = None
-) -> str:
-  """Returns the colored text with ANSI color characters.
-
-  Args:
-    text: A string that may or may not already has ANSI color characters.
-    color: A string for text colors. Applicable values are:
-      'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white'.
-    background: A string for background colors. Applicable values are:
-      'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white'.
-    styles: A list of strings for applying styles on the text.
-      Applicable values are: 
-      'bold', 'dark', 'underline', 'blink', 'reverse', 'concealed'.
-
-  Returns:
-    A string with ANSI color characters embracing the entire text.
-  """
-  if not termcolor:
-    return text
-  return termcolor.colored(
-      text,
-      color=color,
-      on_color=('on_' + background) if background else None,
-      attrs=styles)
-
-
-def colored_template(
-    text: str,
-    expression_color: str | None = 'white',
-    expression_background: str | None = 'blue',
-    expression_styles: list[str] | None = None,
-    statement_color: str | None = 'red',
-    statement_background: str | None = None,
-    statement_styles: list[str] | None = None,
-    comment_color: str | None = 'green',
-    comment_background: str | None = None,
-    comment_styles: list[str] | None = None,
-    ) -> str:
-  """Returns colored (maybe) Jinja2 template string."""
-  text = color_text_blocks(
-      text, '{{', '}}',
-      color=expression_color,
-      background=expression_background,
-      styles=expression_styles)
-
-  text = color_text_blocks(
-      text, '{%', '%}',
-      color=statement_color,
-      background=statement_background,
-      styles=statement_styles)
-
-  text = color_text_blocks(
-      text, '{#', '#}',
-      color=comment_color,
-      background=comment_background,
-      styles=comment_styles)
-
-  return text
-
-
-def color_text_blocks(
-    text: str,
-    block_start: str,
-    block_end: str,
-    color: str | None = None,
-    background: str | None = None,
-    styles: list[str] | None = None
-) -> str:
-  """Apply colors to text blocks.
-
-  Args:
-    text: A string that may or may not already has ANSI color characters.
-    block_start: A string that signals the start of a block. E.g. '{{'
-    block_end: A string that signals the end of a block. E.g. '}}'.
-    color: A string for text colors. Applicable values are:
-      'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white'.
-    background: A string for background colors. Applicable values are:
-      'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white'.
-    styles: A list of strings for applying styles on the text.
-      Applicable values are: 
-      'bold', 'dark', 'underline', 'blink', 'reverse', 'concealed'.
-
-  Returns:
-    A string with ANSI color characters embracing the matched text blocks.
-  """
-  if not color and not background and not styles:
-    return text
-
-  string_buffer = io.StringIO()
-  start_index = 0
-  end_index = 0
-  previous_color = None
-
-  def write_nonblock_text(text: str, previous_color: str | None):
-    if previous_color:
-      string_buffer.write(previous_color)
-    string_buffer.write(text)
-
-  while start_index < len(text):
-    start_index = text.find(block_start, end_index)
-    if start_index == -1:
-      write_nonblock_text(text[end_index:], previous_color)
-      break
-
-    # Deal with text since last block.
-    since_last_block = text[end_index:start_index]
-    write_nonblock_text(since_last_block, previous_color)
-    colors = re.findall(_ANSI_COLOR_REGEX, since_last_block)
-    if colors:
-      previous_color = colors[-1]
-
-    # Match block.
-    end_index = text.find(block_end, start_index + len(block_start))
-    if end_index == -1:
-      write_nonblock_text(text[start_index:], previous_color)
-      break
-    end_index += len(block_end)
-
-    # Write block text.
-    block = text[start_index:end_index]
-    colored_block = colored(
-        block, color=color, background=background, styles=styles)
-    string_buffer.write(colored_block)
-  return string_buffer.getvalue()
-
-
-def colored_print(value: Any):
-  """Prints text with color."""
-  print(colored_template(str(value)))
-

langfun/core/text_formatting_test.py

@@ -1,65 +0,0 @@
-# Copyright 2023 The Langfun Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""Tests for text formatting."""
-
-import inspect
-import unittest
-from langfun.core import text_formatting
-
-
-class TextFormattingTest(unittest.TestCase):
-
-  def test_colored_template(self):
-    original_text = inspect.cleandoc("""
-        Hi {{ foo }}
-        {# print x if x is present #}
-        {% if x %}
-        {{ x }}
-        {% endif %}
-        """)
-
-    colored_text = text_formatting.colored_template(
-        text_formatting.colored(original_text, color='blue')
-    )
-    self.assertEqual(
-        colored_text,
-        '\x1b[34mHi \x1b[44m\x1b[37m{{ foo }}\x1b[0m\x1b[34m\n'
-        '\x1b[32m{# print x if x is present #}\x1b[0m\x1b[34m\n'
-        '\x1b[31m{% if x %}\x1b[0m\x1b[34m\n'
-        '\x1b[44m\x1b[37m{{ x }}\x1b[0m\x1b[34m\n'
-        '\x1b[31m{% endif %}\x1b[0m\x1b[34m\x1b[0m'
-    )
-    self.assertEqual(text_formatting.decolored(colored_text), original_text)
-
-  def test_colored_without_termcolor(self):
-    termcolor = text_formatting.termcolor
-    text_formatting.termcolor = None
-    original_text = inspect.cleandoc("""
-        Hi {{ foo }}
-        {# print x if x is present #}
-        {% if x %}
-        {{ x }}
-        {% endif %}
-        """)
-
-    colored_text = text_formatting.colored_template(
-        text_formatting.colored(original_text, color='blue')
-    )
-    self.assertEqual(colored_text, original_text)
-    self.assertEqual(text_formatting.decolored(colored_text), original_text)
-    text_formatting.termcolor = termcolor
-
-
-if __name__ == '__main__':
-  unittest.main()