pixeltable 0.3.6__py3-none-any.whl → 0.3.8__py3-none-any.whl

pixeltable/functions/fireworks.py

@@ -9,6 +9,7 @@ from typing import TYPE_CHECKING, Optional
 
 import pixeltable as pxt
 from pixeltable import env
+from pixeltable.config import Config
 from pixeltable.utils.code import local_public_names
 
 if TYPE_CHECKING:
@@ -41,7 +42,7 @@ async def chat_completions(
     Creates a model response for the given chat conversation.
 
     Equivalent to the Fireworks AI `chat/completions` API endpoint.
-    For additional details, see: [https://docs.fireworks.ai/api-reference/post-chatcompletions](https://docs.fireworks.ai/api-reference/post-chatcompletions)
+    For additional details, see: <https://docs.fireworks.ai/api-reference/post-chatcompletions>
 
     Request throttling:
     Applies the rate limit set in the config (section `fireworks`, key `rate_limit`). If no rate
@@ -55,7 +56,7 @@ async def chat_completions(
         messages: A list of messages comprising the conversation so far.
         model: The name of the model to use.
 
-    For details on the other parameters, see: [https://docs.fireworks.ai/api-reference/post-chatcompletions](https://docs.fireworks.ai/api-reference/post-chatcompletions)
+    For details on the other parameters, see: <https://docs.fireworks.ai/api-reference/post-chatcompletions>
 
     Returns:
         A dictionary containing the response and other metadata.
@@ -65,7 +66,9 @@ async def chat_completions(
         to an existing Pixeltable column `tbl.prompt` of the table `tbl`:
 
         >>> messages = [{'role': 'user', 'content': tbl.prompt}]
-        ... tbl.add_computed_column(response=chat_completions(messages, model='accounts/fireworks/models/mixtral-8x22b-instruct'))
+        ... tbl.add_computed_column(
+        ...     response=chat_completions(messages, model='accounts/fireworks/models/mixtral-8x22b-instruct')
+        ... )
     """
     kwargs = {'max_tokens': max_tokens, 'top_k': top_k, 'top_p': top_p, 'temperature': temperature}
     kwargs_not_none = {k: v for k, v in kwargs.items() if v is not None}
@@ -75,7 +78,7 @@ async def chat_completions(
     # res_sync_dict = res_sync.dict()
 
     if request_timeout is None:
-        request_timeout = env.Env.get().config.get_int_value('timeout', section='fireworks') or 600
+        request_timeout = Config.get().get_int_value('timeout', section='fireworks') or 600
     # TODO: this timeout doesn't really work, I think it only applies to returning the stream, but not to the timing
     # of the chunks; addressing this would require a timeout for the task running this udf
     stream = _fireworks_client().chat.completions.acreate(

pixeltable/functions/globals.py

@@ -6,9 +6,8 @@ from typing import Optional, Union
 
 import sqlalchemy as sql
 
-import pixeltable.func as func
 import pixeltable.type_system as ts
-from pixeltable import exprs
+from pixeltable import exprs, func
 from pixeltable.utils.code import local_public_names
 
 
@@ -50,7 +49,6 @@ def _(val: sql.ColumnElement) -> Optional[sql.ColumnElement]:
 @func.uda(
     allows_window=True,
     # Allow counting non-null values of any type
-    # TODO: I couldn't include "Array" because we don't have a way to represent a generic array (of arbitrary dimension).
     # TODO: should we have an "Any" type that can be used here?
     type_substitutions=tuple(
         {T: Optional[t]}  # type: ignore[misc]
@@ -60,6 +58,7 @@ def _(val: sql.ColumnElement) -> Optional[sql.ColumnElement]:
             ts.Float,
             ts.Bool,
             ts.Timestamp,
+            ts.Array,
             ts.Json,
             ts.Image,
             ts.Video,
@@ -107,7 +106,7 @@ class min(func.Aggregator, typing.Generic[T]):
 
 @min.to_sql
 def _(val: sql.ColumnElement) -> Optional[sql.ColumnElement]:
-    if val.type.python_type == bool:
+    if val.type.python_type is bool:
         # TODO: min/max aggregation of booleans is not supported in Postgres (but it is in Python).
         # Right now we simply force the computation to be done in Python; we might consider implementing an alternate
         # way of doing it in SQL. (min/max of booleans is simply logical and/or, respectively.)
@@ -137,7 +136,7 @@ class max(func.Aggregator, typing.Generic[T]):
 
 @max.to_sql
 def _(val: sql.ColumnElement) -> Optional[sql.ColumnElement]:
-    if val.type.python_type == bool:
+    if val.type.python_type is bool:
         # TODO: see comment in @min.to_sql.
         return None
     return sql.sql.func.max(val)

pixeltable/functions/huggingface.py

@@ -12,8 +12,8 @@ from typing import Any, Callable, Optional, TypeVar
 import PIL.Image
 
 import pixeltable as pxt
-import pixeltable.env as env
 import pixeltable.exceptions as excs
+from pixeltable import env
 from pixeltable.func import Batch
 from pixeltable.functions.util import normalize_image_mode, resolve_torch_device
 from pixeltable.utils.code import local_public_names
@@ -50,7 +50,6 @@ def sentence_transformer(
     """
     env.Env.get().require_package('sentence_transformers')
     device = resolve_torch_device('auto')
-    import torch
     from sentence_transformers import SentenceTransformer  # type: ignore
 
     # specifying the device, moves the model to device (gpu:cuda/mps, cpu)
@@ -76,7 +75,6 @@ def _(model_id: str) -> pxt.ArrayType:
 def sentence_transformer_list(sentences: list, *, model_id: str, normalize_embeddings: bool = False) -> list:
     env.Env.get().require_package('sentence_transformers')
     device = resolve_torch_device('auto')
-    import torch
     from sentence_transformers import SentenceTransformer
 
     # specifying the device, moves the model to device (gpu:cuda/mps, cpu)
@@ -117,7 +115,6 @@ def cross_encoder(sentences1: Batch[str], sentences2: Batch[str], *, model_id: s
     """
     env.Env.get().require_package('sentence_transformers')
     device = resolve_torch_device('auto')
-    import torch
     from sentence_transformers import CrossEncoder
 
     # specifying the device, moves the model to device (gpu:cuda/mps, cpu)
@@ -132,7 +129,6 @@ def cross_encoder(sentences1: Batch[str], sentences2: Batch[str], *, model_id: s
 def cross_encoder_list(sentence1: str, sentences2: list, *, model_id: str) -> list:
     env.Env.get().require_package('sentence_transformers')
     device = resolve_torch_device('auto')
-    import torch
     from sentence_transformers import CrossEncoder
 
     # specifying the device, moves the model to device (gpu:cuda/mps, cpu)

pixeltable/functions/image.py

@@ -80,7 +80,9 @@ def convert(self: PIL.Image.Image, mode: str) -> PIL.Image.Image:
     [`PIL.Image.Image.convert()`](https://pillow.readthedocs.io/en/stable/reference/Image.html#PIL.Image.Image.convert).
 
     Args:
-        mode: The mode to convert to. See the [Pillow documentation](https://pillow.readthedocs.io/en/stable/handbook/concepts.html#concept-modes) for a list of supported modes.
+        mode: The mode to convert to. See the
+            [Pillow documentation](https://pillow.readthedocs.io/en/stable/handbook/concepts.html#concept-modes)
+            for a list of supported modes.
     """
     return self.convert(mode)
 
@@ -109,7 +111,7 @@ def crop(self: PIL.Image.Image, box: tuple[int, int, int, int]) -> PIL.Image.Ima
 def _(self: Expr, box: tuple[int, int, int, int]) -> pxt.ColumnType:
     input_type = self.col_type
     assert isinstance(input_type, pxt.ImageType)
-    if (isinstance(box, list) or isinstance(box, tuple)) and len(box) == 4 and all(isinstance(x, int) for x in box):
+    if (isinstance(box, (list, tuple))) and len(box) == 4 and all(isinstance(x, int) for x in box):
         return pxt.ImageType(
             size=(box[2] - box[0], box[3] - box[1]), mode=input_type.mode, nullable=input_type.nullable
         )
@@ -225,7 +227,9 @@ def transpose(self: PIL.Image.Image, method: int) -> PIL.Image.Image:
     [`PIL.Image.Image.transpose()`](https://pillow.readthedocs.io/en/stable/reference/Image.html#PIL.Image.Image.transpose)
 
     Args:
-        method: The transpose method. See the [Pillow documentation](https://pillow.readthedocs.io/en/stable/reference/Image.html#PIL.Image.Image.transpose) for a list of supported methods.
+        method: The transpose method. See the
+            [Pillow documentation](https://pillow.readthedocs.io/en/stable/reference/Image.html#PIL.Image.Image.transpose)
+            for a list of supported methods.
     """
     pass
 
@@ -271,7 +275,8 @@ def getbbox(self: PIL.Image.Image, *, alpha_only: bool = True) -> tuple[int, int
     Equivalent to [`PIL.Image.Image.getbbox()`](https://pillow.readthedocs.io/en/stable/reference/Image.html#PIL.Image.Image.getbbox)
 
     Args:
-        alpha_only: If `True`, and the image has an alpha channel, trim transparent pixels. Otherwise, trim pixels when all channels are zero.
+        alpha_only: If `True`, and the image has an alpha channel, trim transparent pixels. Otherwise,
+            trim pixels when all channels are zero.
     """
     pass
 
@@ -375,10 +380,14 @@ def quantize(
 
     Args:
         colors: The number of colors to quantize to.
-        method: The quantization method. See the [Pillow documentation](https://pillow.readthedocs.io/en/stable/reference/Image.html#PIL.Image.Image.quantize) for a list of supported methods.
+        method: The quantization method. See the
+            [Pillow documentation](https://pillow.readthedocs.io/en/stable/reference/Image.html#PIL.Image.Image.quantize)
+            for a list of supported methods.
         kmeans: The number of k-means clusters to use.
         palette: The palette to use.
-        dither: The dithering method. See the [Pillow documentation](https://pillow.readthedocs.io/en/stable/reference/Image.html#PIL.Image.Image.quantize) for a list of supported methods.
+        dither: The dithering method. See the
+            [Pillow documentation](https://pillow.readthedocs.io/en/stable/reference/Image.html#PIL.Image.Image.quantize)
+            for a list of supported methods.
     """
     pass
 
@@ -393,7 +402,8 @@ def reduce(self: PIL.Image.Image, factor: int, box: Optional[tuple[int, int, int
 
     Args:
         factor: The reduction factor.
-        box: An optional 4-tuple of ints providing the source image region to be reduced. The values must be within (0, 0, width, height) rectangle. If omitted or None, the entire source is used.
+        box: An optional 4-tuple of ints providing the source image region to be reduced. The values must be within
+            (0, 0, width, height) rectangle. If omitted or None, the entire source is used.
     """
     pass
 

pixeltable/functions/llama_cpp.py

@@ -62,7 +62,7 @@ def create_chat_completion(
 def _is_gpu_available() -> bool:
     import llama_cpp
 
-    global _IS_GPU_AVAILABLE
+    global _IS_GPU_AVAILABLE  # noqa: PLW0603
     if _IS_GPU_AVAILABLE is None:
         llama_cpp_path = Path(llama_cpp.__file__).parent
         lib = llama_cpp.llama_cpp.load_shared_library('llama', llama_cpp_path / 'lib')

pixeltable/functions/mistralai.py

@@ -148,7 +148,7 @@ _embedding_dimensions_cache: dict[str, int] = {'mistral-embed': 1024}
 
 
 @pxt.udf(batch_size=16, resource_pool='request-rate:mistral')
-async def embeddings(input: Batch[str], *, model: str) -> Batch[pxt.Array[(None,), pxt.Float]]:
+async def embeddings(input: Batch[str], *, model: str) -> Batch[pxt.Array[(None,), pxt.Float]]:  # noqa: RUF029
     """
     Embeddings API.
 

pixeltable/functions/ollama.py

@@ -50,8 +50,8 @@ def generate(
         template: Prompt template to use.
         context: The context parameter returned from a previous call to `generate()`.
         raw: If `True`, no formatting will be applied to the prompt.
-        options: Additional options to pass to the `chat` call, such as `max_tokens`, `temperature`, `top_p`, and `top_k`.
-            For details, see the
+        options: Additional options to pass to the `chat` call, such as `max_tokens`, `temperature`, `top_p`, and
+            `top_k`. For details, see the
             [Valid Parameters and Values](https://github.com/ollama/ollama/blob/main/docs/modelfile.md#valid-parameters-and-values)
             section of the Ollama documentation.
     """
@@ -89,8 +89,8 @@ def chat(
         model: The model name.
         tools: Tools for the model to use.
         format: The format of the response; must be one of `'json'` or `None`.
-        options: Additional options to pass to the `chat` call, such as `max_tokens`, `temperature`, `top_p`, and `top_k`.
-            For details, see the
+        options: Additional options to pass to the `chat` call, such as `max_tokens`, `temperature`, `top_p`, and
+            `top_k`. For details, see the
             [Valid Parameters and Values](https://github.com/ollama/ollama/blob/main/docs/modelfile.md#valid-parameters-and-values)
             section of the Ollama documentation.
     """

pixeltable/functions/openai.py

@@ -183,7 +183,7 @@ async def speech(
     Generates audio from the input text.
 
     Equivalent to the OpenAI `audio/speech` API endpoint.
-    For additional details, see: [https://platform.openai.com/docs/guides/text-to-speech](https://platform.openai.com/docs/guides/text-to-speech)
+    For additional details, see: <https://platform.openai.com/docs/guides/text-to-speech>
 
     Request throttling:
     Applies the rate limit set in the config (section `openai.rate_limits`; use the model id as the key). If no rate
@@ -199,7 +199,7 @@ async def speech(
         voice: The voice profile to use for speech synthesis. Supported options include:
             `alloy`, `echo`, `fable`, `onyx`, `nova`, and `shimmer`.
 
-    For details on the other parameters, see: [https://platform.openai.com/docs/api-reference/audio/createSpeech](https://platform.openai.com/docs/api-reference/audio/createSpeech)
+    For details on the other parameters, see: <https://platform.openai.com/docs/api-reference/audio/createSpeech>
 
     Returns:
         An audio file containing the synthesized speech.
@@ -238,7 +238,7 @@ async def transcriptions(
     Transcribes audio into the input language.
 
     Equivalent to the OpenAI `audio/transcriptions` API endpoint.
-    For additional details, see: [https://platform.openai.com/docs/guides/speech-to-text](https://platform.openai.com/docs/guides/speech-to-text)
+    For additional details, see: <https://platform.openai.com/docs/guides/speech-to-text>
 
     Request throttling:
     Applies the rate limit set in the config (section `openai.rate_limits`; use the model id as the key). If no rate
@@ -252,7 +252,7 @@ async def transcriptions(
         audio: The audio to transcribe.
         model: The model to use for speech transcription.
 
-    For details on the other parameters, see: [https://platform.openai.com/docs/api-reference/audio/createTranscription](https://platform.openai.com/docs/api-reference/audio/createTranscription)
+    For details on the other parameters, see: <https://platform.openai.com/docs/api-reference/audio/createTranscription>
 
     Returns:
         A dictionary containing the transcription and other metadata.
@@ -288,7 +288,7 @@ async def translations(
     Translates audio into English.
 
     Equivalent to the OpenAI `audio/translations` API endpoint.
-    For additional details, see: [https://platform.openai.com/docs/guides/speech-to-text](https://platform.openai.com/docs/guides/speech-to-text)
+    For additional details, see: <https://platform.openai.com/docs/guides/speech-to-text>
 
     Request throttling:
     Applies the rate limit set in the config (section `openai.rate_limits`; use the model id as the key). If no rate
@@ -302,7 +302,7 @@ async def translations(
         audio: The audio to translate.
         model: The model to use for speech transcription and translation.
 
-    For details on the other parameters, see: [https://platform.openai.com/docs/api-reference/audio/createTranslation](https://platform.openai.com/docs/api-reference/audio/createTranslation)
+    For details on the other parameters, see: <https://platform.openai.com/docs/api-reference/audio/createTranslation>
 
     Returns:
         A dictionary containing the translation and other metadata.
@@ -395,7 +395,7 @@ async def chat_completions(
     Creates a model response for the given chat conversation.
 
     Equivalent to the OpenAI `chat/completions` API endpoint.
-    For additional details, see: [https://platform.openai.com/docs/guides/chat-completions](https://platform.openai.com/docs/guides/chat-completions)
+    For additional details, see: <https://platform.openai.com/docs/guides/chat-completions>
 
     Request throttling:
     Uses the rate limit-related headers returned by the API to throttle requests adaptively, based on available
@@ -409,7 +409,7 @@ async def chat_completions(
         messages: A list of messages to use for chat completion, as described in the OpenAI API documentation.
         model: The model to use for chat completion.
 
-    For details on the other parameters, see: [https://platform.openai.com/docs/api-reference/chat](https://platform.openai.com/docs/api-reference/chat)
+    For details on the other parameters, see: <https://platform.openai.com/docs/api-reference/chat>
 
     Returns:
         A dictionary containing the response and other metadata.
@@ -498,9 +498,9 @@ def _vision_get_request_resources(
     crops_height = math.ceil(image.height / 512)
     total_crops = crops_width * crops_height
 
-    BASE_TOKENS = 85  # base cost for the initial 512x512 overview
-    CROP_TOKENS = 170  # cost per additional 512x512 crop
-    img_tokens = BASE_TOKENS + (CROP_TOKENS * total_crops)
+    base_tokens = 85  # base cost for the initial 512x512 overview
+    crop_tokens = 170  # cost per additional 512x512 crop
+    img_tokens = base_tokens + (crop_tokens * total_crops)
 
     total_tokens = (
         prompt_tokens
@@ -527,7 +527,7 @@ async def vision(
     Analyzes an image with the OpenAI vision capability. This is a convenience function that takes an image and
     prompt, and constructs a chat completion request that utilizes OpenAI vision.
 
-    For additional details, see: [https://platform.openai.com/docs/guides/vision](https://platform.openai.com/docs/guides/vision)
+    For additional details, see: <https://platform.openai.com/docs/guides/vision>
 
     Request throttling:
     Uses the rate limit-related headers returned by the API to throttle requests adaptively, based on available
@@ -616,7 +616,7 @@ async def embeddings(
     Creates an embedding vector representing the input text.
 
     Equivalent to the OpenAI `embeddings` API endpoint.
-    For additional details, see: [https://platform.openai.com/docs/guides/embeddings](https://platform.openai.com/docs/guides/embeddings)
+    For additional details, see: <https://platform.openai.com/docs/guides/embeddings>
 
     Request throttling:
     Uses the rate limit-related headers returned by the API to throttle requests adaptively, based on available
@@ -632,7 +632,7 @@ async def embeddings(
         dimensions: The vector length of the embedding. If not specified, Pixeltable will use
             a default value based on the model.
 
-    For details on the other parameters, see: [https://platform.openai.com/docs/api-reference/embeddings](https://platform.openai.com/docs/api-reference/embeddings)
+    For details on the other parameters, see: <https://platform.openai.com/docs/api-reference/embeddings>
 
     Returns:
         An array representing the application of the given embedding to `input`.
@@ -671,7 +671,7 @@ def _(model: str, dimensions: Optional[int] = None) -> pxt.ArrayType:
         if model not in _embedding_dimensions_cache:
             # TODO: find some other way to retrieve a sample
             return pxt.ArrayType((None,), dtype=pxt.FloatType(), nullable=False)
-        dimensions = _embedding_dimensions_cache.get(model, None)
+        dimensions = _embedding_dimensions_cache.get(model)
     return pxt.ArrayType((dimensions,), dtype=pxt.FloatType(), nullable=False)
 
 
@@ -694,7 +694,7 @@ async def image_generations(
     Creates an image given a prompt.
 
     Equivalent to the OpenAI `images/generations` API endpoint.
-    For additional details, see: [https://platform.openai.com/docs/guides/images](https://platform.openai.com/docs/guides/images)
+    For additional details, see: <https://platform.openai.com/docs/guides/images>
 
     Request throttling:
     Applies the rate limit set in the config (section `openai.rate_limits`; use the model id as the key). If no rate
@@ -708,7 +708,7 @@ async def image_generations(
         prompt: Prompt for the image.
         model: The model to use for the generations.
 
-    For details on the other parameters, see: [https://platform.openai.com/docs/api-reference/images/create](https://platform.openai.com/docs/api-reference/images/create)
+    For details on the other parameters, see: <https://platform.openai.com/docs/api-reference/images/create>
 
     Returns:
         The generated image.
@@ -761,7 +761,7 @@ async def moderations(input: str, *, model: str = 'omni-moderation-latest') -> d
     Classifies if text is potentially harmful.
 
     Equivalent to the OpenAI `moderations` API endpoint.
-    For additional details, see: [https://platform.openai.com/docs/guides/moderation](https://platform.openai.com/docs/guides/moderation)
+    For additional details, see: <https://platform.openai.com/docs/guides/moderation>
 
     Request throttling:
     Applies the rate limit set in the config (section `openai.rate_limits`; use the model id as the key). If no rate
@@ -775,7 +775,7 @@ async def moderations(input: str, *, model: str = 'omni-moderation-latest') -> d
         input: Text to analyze with the moderations model.
         model: The model to use for moderations.
 
-    For details on the other parameters, see: [https://platform.openai.com/docs/api-reference/moderations](https://platform.openai.com/docs/api-reference/moderations)
+    For details on the other parameters, see: <https://platform.openai.com/docs/api-reference/moderations>
 
     Returns:
         Details of the moderations results.

pixeltable/functions/string.py

@@ -12,10 +12,10 @@ t.select(pxt_str.capitalize(t.str_col)).collect()
 ```
 """
 
+import builtins
 from typing import Any, Optional
 
 import pixeltable as pxt
-import pixeltable.exceptions as excs
 from pixeltable.utils.code import local_public_names
 
 
@@ -70,11 +70,10 @@ def contains(self: str, pattern: str, case: bool = True, flags: int = 0, regex:
         if not case:
             flags |= re.IGNORECASE
         return bool(re.search(pattern, self, flags))
+    elif case:
+        return pattern in self
     else:
-        if case:
-            return pattern in self
-        else:
-            return pattern.lower() in self.lower()
+        return pattern.lower() in self.lower()
 
 
 @pxt.udf(is_method=True)
@@ -87,9 +86,8 @@ def count(self: str, pattern: str, flags: int = 0) -> int:
         flags: [flags](https://docs.python.org/3/library/re.html#flags) for the `re` module
     """
     import re
-    from builtins import len
 
-    return len(re.findall(pattern, self, flags))
+    return builtins.len(re.findall(pattern, self, flags))
 
 
 @pxt.udf(is_method=True)
@@ -263,7 +261,8 @@ def isidentifier(self: str) -> bool:
 @pxt.udf(is_method=True)
 def islower(self: str) -> bool:
     """
-    Return `True` if all cased characters in the string are lowercase and there is at least one cased character, `False` otherwise.
+    Return `True` if all cased characters in the string are lowercase and there is at least one cased character,
+    `False` otherwise.
 
     Equivalent to [`str.islower()`](https://docs.python.org/3/library/stdtypes.html#str.islower)
     """
@@ -283,7 +282,8 @@ def isnumeric(self: str) -> bool:
 @pxt.udf(is_method=True)
 def isupper(self: str) -> bool:
     """
-    Return `True` if all cased characters in the string are uppercase and there is at least one cased character, `False` otherwise.
+    Return `True` if all cased characters in the string are uppercase and there is at least one cased character,
+    `False` otherwise.
 
     Equivalent to [`str.isupper()`](https://docs.python.org/3/library/stdtypes.html#str.isupper)
     """
@@ -303,7 +303,8 @@ def istitle(self: str) -> bool:
 @pxt.udf(is_method=True)
 def isspace(self: str) -> bool:
     """
-    Return `True` if there are only whitespace characters in the string and there is at least one character, `False` otherwise.
+    Return `True` if there are only whitespace characters in the string and there is at least one character,
+    `False` otherwise.
 
     Equivalent to [`str.isspace()`](https://docs.python.org/3/library/stdtypes.html#str.isspace)
     """
@@ -327,7 +328,7 @@ def len(self: str) -> int:
 
     Equivalent to [`len(str)`](https://docs.python.org/3/library/functions.html#len)
     """
-    return self.__len__()
+    return builtins.len(self)
 
 
 @pxt.udf(is_method=True)
@@ -338,7 +339,8 @@ def ljust(self: str, width: int, fillchar: str = ' ') -> str:
     Equivalent to [`str.ljust()`](https://docs.python.org/3/library/stdtypes.html#str.ljust)
 
     Args:
-        width: Minimum width of resulting string; additional characters will be filled with character defined in `fillchar`.
+        width: Minimum width of resulting string; additional characters will be filled with character defined in
+            `fillchar`.
         fillchar: Additional character for filling.
     """
     return self.ljust(width, fillchar)
@@ -393,7 +395,7 @@ def normalize(self: str, form: str) -> str:
     Equivalent to [`unicodedata.normalize()`](https://docs.python.org/3/library/unicodedata.html#unicodedata.normalize)
 
     Args:
-        form: Unicode normal form (`‘NFC’`, `‘NFKC’`, `‘NFD’`, `‘NFKD’`)
+        form: Unicode normal form (`'NFC'`, `'NFKC'`, `'NFD'`, `'NFKD'`)
     """
     import unicodedata
 
@@ -406,8 +408,9 @@ def pad(self: str, width: int, side: str = 'left', fillchar: str = ' ') -> str:
     Pad string up to width
 
     Args:
-        width: Minimum width of resulting string; additional characters will be filled with character defined in `fillchar`.
-        side: Side from which to fill resulting string (`‘left’`, `‘right’`, `‘both’`)
+        width: Minimum width of resulting string; additional characters will be filled with character defined in
+            `fillchar`.
+        side: Side from which to fill resulting string (`'left'`, `'right'`, `'both'`)
         fillchar: Additional character for filling
     """
     if side == 'left':
@@ -430,9 +433,7 @@ def partition(self: str, sep: str = ' ') -> list:
     idx = self.find(sep)
     if idx == -1:
         return [self, '', '']
-    from builtins import len
-
-    return [self[:idx], sep, self[idx + len(sep) :]]
+    return [self[:idx], sep, self[idx + builtins.len(sep) :]]
 
 
 @pxt.udf(is_method=True)
@@ -441,10 +442,7 @@ def removeprefix(self: str, prefix: str) -> str:
     Remove prefix. If the prefix is not present, returns string.
     """
     if self.startswith(prefix):
-        # we need to avoid referring to our symbol 'len'
-        from builtins import len
-
-        return self[len(prefix) :]
+        return self[builtins.len(prefix) :]
     return self
 
 
@@ -454,10 +452,7 @@ def removesuffix(self: str, suffix: str) -> str:
     Remove suffix. If the suffix is not present, returns string.
     """
     if self.endswith(suffix):
-        # we need to avoid referring to our symbol 'len'
-        from builtins import len
-
-        return self[: -len(suffix)]
+        return self[: -builtins.len(suffix)]
     return self
 
 
@@ -492,7 +487,7 @@ def replace(
 
         if not case:
             flags |= re.IGNORECASE
-        return re.sub(pattern, repl, self, 0 if n == -1 else n, flags)
+        return re.sub(pattern, repl, self, count=(0 if n == -1 else n), flags=flags)
     else:
         return self.replace(pattern, repl, n)
 
@@ -546,9 +541,7 @@ def rpartition(self: str, sep: str = ' ') -> list:
     idx = self.rfind(sep)
     if idx == -1:
         return [self, '', '']
-    from builtins import len
-
-    return [self[:idx], sep, self[idx + len(sep) :]]
+    return [self[:idx], sep, self[idx + builtins.len(sep) :]]
 
 
 @pxt.udf(is_method=True)

pixeltable/functions/timestamp.py

@@ -19,6 +19,8 @@ import pixeltable as pxt
 from pixeltable.env import Env
 from pixeltable.utils.code import local_public_names
 
+_SQL_ZERO = sql.literal(0)
+
 
 @pxt.udf(is_property=True)
 def year(self: datetime) -> int:
@@ -191,7 +193,9 @@ def isoformat(self: datetime, sep: str = 'T', timespec: str = 'auto') -> str:
 
     Args:
         sep: Separator between date and time.
-        timespec: The number of additional terms in the output. See the [`datetime.isoformat()`](https://docs.python.org/3/library/datetime.html#datetime.datetime.isoformat) documentation for more details.
+        timespec: The number of additional terms in the output. See the
+            [`datetime.isoformat()`](https://docs.python.org/3/library/datetime.html#datetime.datetime.isoformat)
+            documentation for more details.
     """
     return self.isoformat(sep=sep, timespec=timespec)
 
@@ -204,7 +208,8 @@ def strftime(self: datetime, format: str) -> str:
     Equivalent to [`datetime.strftime()`](https://docs.python.org/3/library/datetime.html#datetime.datetime.strftime).
 
     Args:
-        format: The format string to control the output. For a complete list of formatting directives, see [`strftime()` and `strptime()` Behavior](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-behavior).
+        format: The format string to control the output. For a complete list of formatting directives, see
+            [`strftime()` and `strptime()` Behavior](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-behavior).
     """
     return self.strftime(format)
 
@@ -226,10 +231,10 @@ def _(
     year: sql.ColumnElement,
     month: sql.ColumnElement,
     day: sql.ColumnElement,
-    hour: sql.ColumnElement = sql.literal(0),
-    minute: sql.ColumnElement = sql.literal(0),
-    second: sql.ColumnElement = sql.literal(0),
-    microsecond: sql.ColumnElement = sql.literal(0),
+    hour: sql.ColumnElement = _SQL_ZERO,
+    minute: sql.ColumnElement = _SQL_ZERO,
+    second: sql.ColumnElement = _SQL_ZERO,
+    microsecond: sql.ColumnElement = _SQL_ZERO,
 ) -> sql.ColumnElement:
     return sql.func.make_timestamptz(
         sql.cast(year, sql.Integer),