Skip to content

AI review fixes for #3951 #4051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanmelt merged 1 commit into from
Oct 13, 2026
Merged

AI review fixes for #3951 #4051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion openc3/lib/openc3/topics/topic.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def self.write_topic(topic, msg_hash, id = '*', maxlen = nil, approximate = 'tru

# @return [Float] Configured safety max age in seconds (<= 0 means disabled)
def self.stream_max_age_seconds
value = ENV['OPENC3_STREAM_MAX_AGE_SECONDS']
value = ENV.fetch('OPENC3_STREAM_MAX_AGE_SECONDS', nil)
return STREAM_MAX_AGE_DEFAULT_SECONDS if value.nil?
return value.to_f
end
Expand Down
5 changes: 2 additions & 3 deletions openc3/python/openc3/topics/topic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,8 @@ def stream_safety_minid(cls, id="*", max_age_ms=None):
if not id or id == "*":
base_ms = int(time.time() * 1000)
else:
if isinstance(id, bytes):
id = id.decode()
base_ms = int(str(id).partition("-")[0])
entry_id = id.decode() if isinstance(id, bytes) else str(id)
base_ms = int(entry_id.partition("-")[0])
minid_ms = base_ms - max_age_ms
if minid_ms <= 0:
return None
Expand Down
28 changes: 14 additions & 14 deletions openc3/python/test/topics/test_topic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ def test_max_age_defaults_to_600(self):
self.assertEqual(Topic.stream_max_age_seconds(), 600)

def test_max_age_reads_env(self):
os.environ["OPENC3_STREAM_MAX_AGE_SECONDS"] = "120"
self.assertEqual(Topic.stream_max_age_seconds(), 120.0)
with patch.dict(os.environ, {"OPENC3_STREAM_MAX_AGE_SECONDS": "120"}):
self.assertEqual(Topic.stream_max_age_seconds(), 120.0)

def test_max_age_ms_is_cached(self):
self.assertEqual(Topic.stream_max_age_ms(), 600000)
os.environ["OPENC3_STREAM_MAX_AGE_SECONDS"] = "120"
self.assertEqual(Topic.stream_max_age_ms(), 600000)
Topic.clear_stream_max_age_cache()
self.assertEqual(Topic.stream_max_age_ms(), 120000)
with patch.dict(os.environ, {"OPENC3_STREAM_MAX_AGE_SECONDS": "120"}):
self.assertEqual(Topic.stream_max_age_ms(), 600000)
Topic.clear_stream_max_age_cache()
self.assertEqual(Topic.stream_max_age_ms(), 120000)

@patch("openc3.topics.topic.time.time", return_value=1700000000.0)
def test_minid_relative_to_now_for_auto_ids(self, _time):
Expand All @@ -57,13 +57,13 @@ def test_minid_explicit_max_age(self):
self.assertIsNone(Topic.stream_safety_minid("1700000000000-0", max_age_ms=0))

def test_minid_disabled(self):
os.environ["OPENC3_STREAM_MAX_AGE_SECONDS"] = "0"
self.assertIsNone(Topic.stream_safety_minid())
self.assertIsNone(Topic.log_stream_safety_minid("INST", "TLM", "DEFAULT"))
with patch.dict(os.environ, {"OPENC3_STREAM_MAX_AGE_SECONDS": "0"}):
self.assertIsNone(Topic.stream_safety_minid())
self.assertIsNone(Topic.log_stream_safety_minid("INST", "TLM", "DEFAULT"))
Topic.clear_stream_max_age_cache()
os.environ["OPENC3_STREAM_MAX_AGE_SECONDS"] = ""
self.assertIsNone(Topic.stream_safety_minid())
self.assertIsNone(Topic.log_stream_safety_minid("INST", "TLM", "DEFAULT"))
with patch.dict(os.environ, {"OPENC3_STREAM_MAX_AGE_SECONDS": ""}):
self.assertIsNone(Topic.stream_safety_minid())
self.assertIsNone(Topic.log_stream_safety_minid("INST", "TLM", "DEFAULT"))

def test_minid_none_for_small_ids(self):
self.assertIsNone(Topic.stream_safety_minid("1000-0"))
Expand All @@ -84,8 +84,8 @@ def test_log_stream_minid_uses_min_age(self, _time):

@patch("openc3.topics.topic.time.time", return_value=1700000000.0)
def test_log_stream_minid_uses_larger_max_age(self, _time):
os.environ["OPENC3_STREAM_MAX_AGE_SECONDS"] = "3600"
self.assertEqual(Topic.log_stream_safety_minid("INST", "TLM", "DEFAULT"), "1699996400000")
with patch.dict(os.environ, {"OPENC3_STREAM_MAX_AGE_SECONDS": "3600"}):
self.assertEqual(Topic.log_stream_safety_minid("INST", "TLM", "DEFAULT"), "1699996400000")

def test_log_stream_minid_is_cached_per_stream(self):
with patch.object(TargetModel, "get", return_value=None) as get:
Expand Down
Loading