Various patches for macOS (orig from @dnks)

Generally hackarounds to various modules to cope with either
linux-specific runtime incompats, file-name-len limits on macos, or
oddly specific to @dnks' setup config template hardcodings XD

(Obvi this commit msg was edited/reformated by @goodboy, who's also
tossed in interleaved todo bullets around each "change")

Hi-level summary,
- config/conf.toml for updated UI font size and graphics throttle.
  - [ ] remove this since it's a project template.
- piker/cli/__init__.py -> Changed transport from UDP to TCP in service
  manager.
  - [ ] this should be the default anyway, likely it was left that way
    on a dev-testing branch this history was clone from..
- piker/data/_symcache.py -> Added recursive dict cleaning for TOML
  serialization.
- piker/fsp/_api.py -> Hash-based key for shared memory buffers (macOS
  compatibility).
- piker/tsp/__init__.py -> Hash-based key for history buffers for macOS
  compatibility.
  * conflict-reso-note: was adjusted by @goodboy in new code location
    `.tsp._history` mod and keeps the orig keying for linux, only
    shortens on mac.
- piker/ui/_display.py -> Modified SHM name assertion for macOS
  compatibility.

Unmentioned changes noticed by @goodboy,
- adds a new `piker.sh` which should be unnecessary pending proper macos
  support in `tractor` via `platformdirs`,
  * 474f1dc4a7
macos_hackarounds
wygud 2025-10-01 09:26:18 -04:00 committed by goodboy
parent 9a720f8e21
commit 8352d89e43
7 changed files with 76 additions and 9 deletions

View File

@ -6,9 +6,11 @@ pikerd = [
[ui] [ui]
# set custom font + size which will scale entire UI # set custom font + size which will scale entire UI~
# font_size = 16 # font_size = 16
# font_size = 32
# font_name = 'Monospaced' # font_name = 'Monospaced'
# colorscheme = 'default' # UNUSED # colorscheme = 'default' # UNUSED
# graphics.update_throttle = 60 # Hz # TODO # graphics.update_throttle = 120 # Hz #PENDING TODO

20
piker.sh 100755
View File

@ -0,0 +1,20 @@
#!/usr/bin/env bash
# macOS wrapper for piker to handle missing XDG_RUNTIME_DIR
# Set up runtime directory for macOS if not already set
if [ -z "$XDG_RUNTIME_DIR" ]; then
# Use macOS standard temp directory with user-specific subdirectory
export XDG_RUNTIME_DIR="/tmp/piker-runtime-$(id -u)"
# Create the directory if it doesn't exist
if [ ! -d "$XDG_RUNTIME_DIR" ]; then
mkdir -p "$XDG_RUNTIME_DIR"
# Set proper permissions (only user can access)
chmod 700 "$XDG_RUNTIME_DIR"
fi
echo "Set XDG_RUNTIME_DIR to: $XDG_RUNTIME_DIR"
fi
# Run piker with all passed arguments
exec uv run piker "$@"

View File

@ -105,6 +105,15 @@ class SymbologyCache(Struct):
def write_config(self) -> None: def write_config(self) -> None:
def clean_dict_for_toml(d):
'''Remove None values from dict recursively for TOML serialization'''
if isinstance(d, dict):
return {k: clean_dict_for_toml(v) for k, v in d.items() if v is not None}
elif isinstance(d, list):
return [clean_dict_for_toml(item) for item in d if item is not None]
else:
return d
# put the backend's pair-struct type ref at the top # put the backend's pair-struct type ref at the top
# of file if possible. # of file if possible.
cachedict: dict[str, Any] = { cachedict: dict[str, Any] = {
@ -125,7 +134,9 @@ class SymbologyCache(Struct):
dct = cachedict[key] = {} dct = cachedict[key] = {}
for key, struct in table.items(): for key, struct in table.items():
dct[key] = struct.to_dict(include_non_members=False) raw_dict = struct.to_dict(include_non_members=False)
# Clean None values for TOML compatibility
dct[key] = clean_dict_for_toml(raw_dict)
try: try:
with self.fp.open(mode='wb') as fp: with self.fp.open(mode='wb') as fp:

View File

@ -200,9 +200,13 @@ def maybe_mk_fsp_shm(
) )
# (attempt to) uniquely key the fsp shm buffers # (attempt to) uniquely key the fsp shm buffers
# Use hash for macOS compatibility (31 char limit)
import hashlib
actor_name, uuid = tractor.current_actor().uid actor_name, uuid = tractor.current_actor().uid
uuid_snip: str = uuid[:16] # Create short hash of sym and target name
key: str = f'piker.{actor_name}[{uuid_snip}].{sym}.{target.name}' content = f'{sym}.{target.name}'
content_hash = hashlib.md5(content.encode()).hexdigest()[:8]
key: str = f'{uuid[:8]}_{content_hash}.fsp'
shm, opened = maybe_open_shm_array( shm, opened = maybe_open_shm_array(
key, key,

View File

@ -32,6 +32,7 @@ from __future__ import annotations
from datetime import datetime from datetime import datetime
from functools import partial from functools import partial
from pathlib import Path from pathlib import Path
import platform
from pprint import pformat from pprint import pformat
from types import ModuleType from types import ModuleType
from typing import ( from typing import (
@ -1380,13 +1381,20 @@ async def manage_history(
service: str = name.rstrip(f'.{mod.name}') service: str = name.rstrip(f'.{mod.name}')
fqme: str = mkt.get_fqme(delim_char='') fqme: str = mkt.get_fqme(delim_char='')
key: str = f'piker.{service}[{uuid[:16]}].{fqme}'
# use a short hash of the `fqme` to deal with macOS
# file-name-len limit..
if platform.system() == 'Darwin':
import hashlib
fqme_hash: str = hashlib.md5(fqme.encode()).hexdigest()[:8]
key: str = f'{uuid[:8]}_{fqme_hash}'
# (maybe) allocate shm array for this broker/symbol which will # (maybe) allocate shm array for this broker/symbol which will
# be used for fast near-term history capture and processing. # be used for fast near-term history capture and processing.
hist_shm, opened = maybe_open_shm_array( hist_shm, opened = maybe_open_shm_array(
size=_default_hist_size, size=_default_hist_size,
append_start_index=_hist_buffer_start, append_start_index=_hist_buffer_start,
key=f'{key}.hist',
key=f'piker.{service}[{uuid[:16]}].{fqme}.hist',
# use any broker defined ohlc dtype: # use any broker defined ohlc dtype:
dtype=getattr(mod, '_ohlc_dtype', def_iohlcv_fields), dtype=getattr(mod, '_ohlc_dtype', def_iohlcv_fields),
@ -1405,7 +1413,7 @@ async def manage_history(
rt_shm, opened = maybe_open_shm_array( rt_shm, opened = maybe_open_shm_array(
size=_default_rt_size, size=_default_rt_size,
append_start_index=_rt_buffer_start, append_start_index=_rt_buffer_start,
key=f'piker.{service}[{uuid[:16]}].{fqme}.rt', key=f'{key}.rt',
# use any broker defined ohlc dtype: # use any broker defined ohlc dtype:
dtype=getattr(mod, '_ohlc_dtype', def_iohlcv_fields), dtype=getattr(mod, '_ohlc_dtype', def_iohlcv_fields),

View File

@ -214,7 +214,9 @@ async def increment_history_view(
hist_chart: ChartPlotWidget = ds.hist_chart hist_chart: ChartPlotWidget = ds.hist_chart
hist_viz: Viz = ds.hist_viz hist_viz: Viz = ds.hist_viz
# viz: Viz = ds.viz # viz: Viz = ds.viz
assert 'hist' in hist_viz.shm.token['shm_name'] # NOTE: Changed for macOS compatibility with shortened shm names
# assert 'hist' in hist_viz.shm.token['shm_name']
assert hist_viz.shm.token['shm_name'].endswith('.h')
# name: str = hist_viz.name # name: str = hist_viz.name
# TODO: seems this is more reliable at keeping the slow # TODO: seems this is more reliable at keeping the slow

20
pikerd.sh 100755
View File

@ -0,0 +1,20 @@
#!/usr/bin/env bash
# macOS wrapper for pikerd to handle missing XDG_RUNTIME_DIR
# Set up runtime directory for macOS if not already set
if [ -z "$XDG_RUNTIME_DIR" ]; then
# Use macOS standard temp directory with user-specific subdirectory
export XDG_RUNTIME_DIR="/tmp/piker-runtime-$(id -u)"
# Create the directory if it doesn't exist
if [ ! -d "$XDG_RUNTIME_DIR" ]; then
mkdir -p "$XDG_RUNTIME_DIR"
# Set proper permissions (only user can access)
chmod 700 "$XDG_RUNTIME_DIR"
fi
echo "Set XDG_RUNTIME_DIR to: $XDG_RUNTIME_DIR"
fi
# Run pikerd with all passed arguments
exec uv run pikerd "$@"