tomtoolkit 2.31.2__tar.gz → 2.31.4__tar.gz

tomtoolkit-2.31.4/.git/FETCH_HEAD

@@ -0,0 +1 @@
+3c591fe37c1f58ee176c967673739f3080315528		'3c591fe37c1f58ee176c967673739f3080315528' of https://github.com/TOMToolkit/tom_base

tomtoolkit-2.31.4/.git/HEAD

@@ -0,0 +1 @@
+3c591fe37c1f58ee176c967673739f3080315528

{tomtoolkit-2.31.2 → tomtoolkit-2.31.4}/.git/config

@@ -9,4 +9,4 @@
 [gc]
 	auto = 0
 [http "https://github.com/"]
-	extraheader = AUTHORIZATION: basic eC1hY2Nlc3MtdG9rZW46Z2hzX21rRGlET1JCS0hwM3o3bnRnVDdJMko3a2M0Ym9MSzFQcXRQYg==
+	extraheader = AUTHORIZATION: basic eC1hY2Nlc3MtdG9rZW46Z2hzX0JFSlNPNlRnOXJyUnBUakpFaUhLUWtzNWpLbFl5VjFSMDJhTw==

tomtoolkit-2.31.4/.git/logs/HEAD

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 3c591fe37c1f58ee176c967673739f3080315528 runner <runner@runnervm46oaq.r4talzohrrqu3kjbgbocduguig.ex.internal.cloudapp.net> 1773943680 +0000	checkout: moving from master to refs/tags/2.31.4

tomtoolkit-2.31.4/.git/refs/tags/2.31.4

@@ -0,0 +1 @@
+3c591fe37c1f58ee176c967673739f3080315528

tomtoolkit-2.31.4/.git/shallow

@@ -0,0 +1 @@
+3c591fe37c1f58ee176c967673739f3080315528

{tomtoolkit-2.31.2 → tomtoolkit-2.31.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tomtoolkit
-Version: 2.31.2
+Version: 2.31.4
 Summary: TOM Toolkit and base modules
 License-Expression: GPL-3.0-only
 License-File: LICENSE
@@ -29,7 +29,7 @@ Requires-Dist: astroquery (<1)
 Requires-Dist: beautifulsoup4 (<5)
 Requires-Dist: crispy-bootstrap4 (>=2023.1,<2024.11)
 Requires-Dist: cryptography (<=47)
-Requires-Dist: django (<5)
+Requires-Dist: django (<6)
 Requires-Dist: django-bootstrap4 (>3,<25)
 Requires-Dist: django-contrib-comments (>=2.0,<3.0)
 Requires-Dist: django-crispy-forms (>=2.0,<3.0)

{tomtoolkit-2.31.2 → tomtoolkit-2.31.4}/docs/common/customsettings.rst

@@ -165,8 +165,8 @@ details and available hooks.
 Default: []
 
 With an `AUTH_STRATEGY <#auth-strategy>`__ value of **LOCKED**, urls in
-this list will remain visible to unauthenticated users. You might add
-the homepage (‘/’), for example.
+this list will remain visible to unauthenticated users. You can also use wild cards to open an entire path.
+You might add the homepage (‘/’), for example, or anything with a path that looks like '/accounts/reset/*/'.
 
 `TARGET_PERMISSIONS_ONLY <#target-permissions-only>`__
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

{tomtoolkit-2.31.2 → tomtoolkit-2.31.4}/poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 2.1.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.3.2 and should not be changed by hand.
 
 [[package]]
 name = "alabaster"
@@ -843,18 +843,18 @@ test-randomorder = ["pytest-randomly"]
 
 [[package]]
 name = "django"
-version = "4.2.28"
+version = "5.2.11"
 description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design."
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.10"
 groups = ["main"]
 files = [
-    {file = "django-4.2.28-py3-none-any.whl", hash = "sha256:49a23c1b83ef31525f8d71a57b040f91d34660edb3f086280a8519855655ed3c"},
-    {file = "django-4.2.28.tar.gz", hash = "sha256:a4b9cd881991add394cafa8bb3b11ad1742d1e1470ba99c3ef53dc540316ccfe"},
+    {file = "django-5.2.11-py3-none-any.whl", hash = "sha256:e7130df33ada9ab5e5e929bc19346a20fe383f5454acb2cc004508f242ee92c0"},
+    {file = "django-5.2.11.tar.gz", hash = "sha256:7f2d292ad8b9ee35e405d965fbbad293758b858c34bbf7f3df551aeeac6f02d3"},
 ]
 
 [package.dependencies]
-asgiref = ">=3.6.0,<4"
+asgiref = ">=3.8.1"
 sqlparse = ">=0.3.1"
 tzdata = {version = "*", markers = "sys_platform == \"win32\""}
 
@@ -1787,8 +1787,10 @@ files = [
     {file = "psycopg2_binary-2.9.11-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c47676e5b485393f069b4d7a811267d3168ce46f988fa602658b8bb901e9e64d"},
     {file = "psycopg2_binary-2.9.11-cp310-cp310-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:a28d8c01a7b27a1e3265b11250ba7557e5f72b5ee9e5f3a2fa8d2949c29bf5d2"},
     {file = "psycopg2_binary-2.9.11-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:5f3f2732cf504a1aa9e9609d02f79bea1067d99edf844ab92c247bbca143303b"},
+    {file = "psycopg2_binary-2.9.11-cp310-cp310-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:865f9945ed1b3950d968ec4690ce68c55019d79e4497366d36e090327ce7db14"},
     {file = "psycopg2_binary-2.9.11-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:91537a8df2bde69b1c1db01d6d944c831ca793952e4f57892600e96cee95f2cd"},
     {file = "psycopg2_binary-2.9.11-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:4dca1f356a67ecb68c81a7bc7809f1569ad9e152ce7fd02c2f2036862ca9f66b"},
+    {file = "psycopg2_binary-2.9.11-cp310-cp310-musllinux_1_2_riscv64.whl", hash = "sha256:0da4de5c1ac69d94ed4364b6cbe7190c1a70d325f112ba783d83f8440285f152"},
     {file = "psycopg2_binary-2.9.11-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:37d8412565a7267f7d79e29ab66876e55cb5e8e7b3bbf94f8206f6795f8f7e7e"},
     {file = "psycopg2_binary-2.9.11-cp310-cp310-win_amd64.whl", hash = "sha256:c665f01ec8ab273a61c62beeb8cce3014c214429ced8a308ca1fc410ecac3a39"},
     {file = "psycopg2_binary-2.9.11-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0e8480afd62362d0a6a27dd09e4ca2def6fa50ed3a4e7c09165266106b2ffa10"},
@@ -1796,8 +1798,10 @@ files = [
     {file = "psycopg2_binary-2.9.11-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:2e164359396576a3cc701ba8af4751ae68a07235d7a380c631184a611220d9a4"},
     {file = "psycopg2_binary-2.9.11-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:d57c9c387660b8893093459738b6abddbb30a7eab058b77b0d0d1c7d521ddfd7"},
     {file = "psycopg2_binary-2.9.11-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:2c226ef95eb2250974bf6fa7a842082b31f68385c4f3268370e3f3870e7859ee"},
+    {file = "psycopg2_binary-2.9.11-cp311-cp311-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:a311f1edc9967723d3511ea7d2708e2c3592e3405677bf53d5c7246753591fbb"},
     {file = "psycopg2_binary-2.9.11-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:ebb415404821b6d1c47353ebe9c8645967a5235e6d88f914147e7fd411419e6f"},
     {file = "psycopg2_binary-2.9.11-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:f07c9c4a5093258a03b28fab9b4f151aa376989e7f35f855088234e656ee6a94"},
+    {file = "psycopg2_binary-2.9.11-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:00ce1830d971f43b667abe4a56e42c1e2d594b32da4802e44a73bacacb25535f"},
     {file = "psycopg2_binary-2.9.11-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:cffe9d7697ae7456649617e8bb8d7a45afb71cd13f7ab22af3e5c61f04840908"},
     {file = "psycopg2_binary-2.9.11-cp311-cp311-win_amd64.whl", hash = "sha256:304fd7b7f97eef30e91b8f7e720b3db75fee010b520e434ea35ed1ff22501d03"},
     {file = "psycopg2_binary-2.9.11-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:be9b840ac0525a283a96b556616f5b4820e0526addb8dcf6525a0fa162730be4"},
@@ -1805,8 +1809,10 @@ files = [
     {file = "psycopg2_binary-2.9.11-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:ab8905b5dcb05bf3fb22e0cf90e10f469563486ffb6a96569e51f897c750a76a"},
     {file = "psycopg2_binary-2.9.11-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:bf940cd7e7fec19181fdbc29d76911741153d51cab52e5c21165f3262125685e"},
     {file = "psycopg2_binary-2.9.11-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:fa0f693d3c68ae925966f0b14b8edda71696608039f4ed61b1fe9ffa468d16db"},
+    {file = "psycopg2_binary-2.9.11-cp312-cp312-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:a1cf393f1cdaf6a9b57c0a719a1068ba1069f022a59b8b1fe44b006745b59757"},
     {file = "psycopg2_binary-2.9.11-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ef7a6beb4beaa62f88592ccc65df20328029d721db309cb3250b0aae0fa146c3"},
     {file = "psycopg2_binary-2.9.11-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:31b32c457a6025e74d233957cc9736742ac5a6cb196c6b68499f6bb51390bd6a"},
+    {file = "psycopg2_binary-2.9.11-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:edcb3aeb11cb4bf13a2af3c53a15b3d612edeb6409047ea0b5d6a21a9d744b34"},
     {file = "psycopg2_binary-2.9.11-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:62b6d93d7c0b61a1dd6197d208ab613eb7dcfdcca0a49c42ceb082257991de9d"},
     {file = "psycopg2_binary-2.9.11-cp312-cp312-win_amd64.whl", hash = "sha256:b33fabeb1fde21180479b2d4667e994de7bbf0eec22832ba5d9b5e4cf65b6c6d"},
     {file = "psycopg2_binary-2.9.11-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b8fb3db325435d34235b044b199e56cdf9ff41223a4b9752e8576465170bb38c"},
@@ -1814,8 +1820,10 @@ files = [
     {file = "psycopg2_binary-2.9.11-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8c55b385daa2f92cb64b12ec4536c66954ac53654c7f15a203578da4e78105c0"},
     {file = "psycopg2_binary-2.9.11-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:c0377174bf1dd416993d16edc15357f6eb17ac998244cca19bc67cdc0e2e5766"},
     {file = "psycopg2_binary-2.9.11-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:5c6ff3335ce08c75afaed19e08699e8aacf95d4a260b495a4a8545244fe2ceb3"},
+    {file = "psycopg2_binary-2.9.11-cp313-cp313-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:84011ba3109e06ac412f95399b704d3d6950e386b7994475b231cf61eec2fc1f"},
     {file = "psycopg2_binary-2.9.11-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ba34475ceb08cccbdd98f6b46916917ae6eeb92b5ae111df10b544c3a4621dc4"},
     {file = "psycopg2_binary-2.9.11-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:b31e90fdd0f968c2de3b26ab014314fe814225b6c324f770952f7d38abf17e3c"},
+    {file = "psycopg2_binary-2.9.11-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:d526864e0f67f74937a8fce859bd56c979f5e2ec57ca7c627f5f1071ef7fee60"},
     {file = "psycopg2_binary-2.9.11-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:04195548662fa544626c8ea0f06561eb6203f1984ba5b4562764fbeb4c3d14b1"},
     {file = "psycopg2_binary-2.9.11-cp313-cp313-win_amd64.whl", hash = "sha256:efff12b432179443f54e230fdf60de1f6cc726b6c832db8701227d089310e8aa"},
     {file = "psycopg2_binary-2.9.11-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:92e3b669236327083a2e33ccfa0d320dd01b9803b3e14dd986a4fc54aa00f4e1"},
@@ -1823,8 +1831,10 @@ files = [
     {file = "psycopg2_binary-2.9.11-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:9b52a3f9bb540a3e4ec0f6ba6d31339727b2950c9772850d6545b7eae0b9d7c5"},
     {file = "psycopg2_binary-2.9.11-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:db4fd476874ccfdbb630a54426964959e58da4c61c9feba73e6094d51303d7d8"},
     {file = "psycopg2_binary-2.9.11-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:47f212c1d3be608a12937cc131bd85502954398aaa1320cb4c14421a0ffccf4c"},
+    {file = "psycopg2_binary-2.9.11-cp314-cp314-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e35b7abae2b0adab776add56111df1735ccc71406e56203515e228a8dc07089f"},
     {file = "psycopg2_binary-2.9.11-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:fcf21be3ce5f5659daefd2b3b3b6e4727b028221ddc94e6c1523425579664747"},
     {file = "psycopg2_binary-2.9.11-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:9bd81e64e8de111237737b29d68039b9c813bdf520156af36d26819c9a979e5f"},
+    {file = "psycopg2_binary-2.9.11-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:32770a4d666fbdafab017086655bcddab791d7cb260a16679cc5a7338b64343b"},
     {file = "psycopg2_binary-2.9.11-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:c3cb3a676873d7506825221045bd70e0427c905b9c8ee8d6acd70cfcbd6e576d"},
     {file = "psycopg2_binary-2.9.11-cp314-cp314-win_amd64.whl", hash = "sha256:4012c9c954dfaccd28f94e84ab9f94e12df76b4afb22331b1f0d3154893a6316"},
     {file = "psycopg2_binary-2.9.11-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:20e7fb94e20b03dcc783f76c0865f9da39559dcc0c28dd1a3fce0d01902a6b9c"},
@@ -1832,8 +1842,10 @@ files = [
     {file = "psycopg2_binary-2.9.11-cp39-cp39-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:9d3a9edcfbe77a3ed4bc72836d466dfce4174beb79eda79ea155cc77237ed9e8"},
     {file = "psycopg2_binary-2.9.11-cp39-cp39-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:44fc5c2b8fa871ce7f0023f619f1349a0aa03a0857f2c96fbc01c657dcbbdb49"},
     {file = "psycopg2_binary-2.9.11-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9c55460033867b4622cda1b6872edf445809535144152e5d14941ef591980edf"},
+    {file = "psycopg2_binary-2.9.11-cp39-cp39-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:2d11098a83cca92deaeaed3d58cfd150d49b3b06ee0d0852be466bf87596899e"},
     {file = "psycopg2_binary-2.9.11-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:691c807d94aecfbc76a14e1408847d59ff5b5906a04a23e12a89007672b9e819"},
     {file = "psycopg2_binary-2.9.11-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:8b81627b691f29c4c30a8f322546ad039c40c328373b11dff7490a3e1b517855"},
+    {file = "psycopg2_binary-2.9.11-cp39-cp39-musllinux_1_2_riscv64.whl", hash = "sha256:b637d6d941209e8d96a072d7977238eea128046effbf37d1d8b2c0764750017d"},
     {file = "psycopg2_binary-2.9.11-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:41360b01c140c2a03d346cec3280cf8a71aa07d94f3b1509fa0161c366af66b4"},
     {file = "psycopg2_binary-2.9.11-cp39-cp39-win_amd64.whl", hash = "sha256:875039274f8a2361e5207857899706da840768e2a775bf8c65e82f60b197df02"},
 ]
@@ -2665,4 +2677,4 @@ type = ["pytest-mypy"]
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.10.0,<3.14"
-content-hash = "4713a4989c2f14f316ba13c224270e8b7b270208b11f885f1713af4020f6315c"
+content-hash = "42e84dedd351bd8a9baa634188ea539502c13cb3ac9f831a53cd59a301ef81cd"

{tomtoolkit-2.31.2 → tomtoolkit-2.31.4}/pyproject.toml

@@ -48,7 +48,7 @@ dependencies = [
     "astropy >=5.3.3,<7 ; python_version >= '3.10'",
     "astropy >=5.3.3,<6 ; python_version < '3.10'",
     "cryptography <=47",
-    "django <5",
+    "django <6",
     "djangorestframework >=3.15,<4",
     "django-bootstrap4 >3,<25",
     "beautifulsoup4 <5",
@@ -71,7 +71,7 @@ dependencies = [
     "importlib-resources >=6.4.5,<6.5.0",
     "django-tasks (>=0.6.1,<0.7.0)",
 ]
-version = "2.31.2"
+version = "2.31.4"
 
 [tool.poetry]
 packages = [ # tell poetry build that the repo is named tom_base (which != name, above)

{tomtoolkit-2.31.2 → tomtoolkit-2.31.4}/tom_alerts/management/commands/runbrokerquery.py

@@ -3,7 +3,6 @@ from django.core.exceptions import ValidationError
 
 from tom_alerts.models import BrokerQuery
 from tom_alerts.alerts import get_service_class
-from time import sleep
 
 
 class Command(BaseCommand):
@@ -21,17 +20,15 @@ class Command(BaseCommand):
             broker_class = get_service_class(query.broker)
             broker = broker_class()
             alerts = broker.fetch_alerts(query.parameters)
-            while True:
+            for alert in alerts:
                 try:
-                    generic_alert = broker.to_generic_alert(next(alerts))
+                    generic_alert = broker.to_generic_alert(alert)
                     target, extras, aliases = generic_alert.to_target()
                     target.full_clean()  # Top Priority is checking that target is unique.
                     target.save(extras=extras, names=aliases)
                     self.stdout.write('Created target: {}'.format(target))
                 except ValidationError as e:
                     self.stdout.write(f'WARNING for {target.name}: {e}')
-                except StopIteration:
-                    self.stdout.write('Finished creating targets')
-                sleep(1)
+            self.stdout.write('Finished creating targets')
         except KeyboardInterrupt:
             self.stdout.write('Exiting...')

{tomtoolkit-2.31.2 → tomtoolkit-2.31.4}/tom_base/__init__.py

@@ -1,2 +1,2 @@
 # this is a placeholder for poetry-dynamic-versioning (see pyproject.toml)
-__version__ = "2.31.2"
+__version__ = "2.31.4"

{tomtoolkit-2.31.2 → tomtoolkit-2.31.4}/tom_base/settings.py

@@ -310,7 +310,7 @@ GENERAL_SEARCH_FUNCTIONS = {}
 # Define custom DataProcessor class
 # DATA_PROCESSOR_CLASS = 'mytom.custom_data_processor.CustomDataProcessor'
 
-# Authentication strategy can either be LOCKED (required login for all views)
+# Authentication strategy can either be LOCKED (required login for all views, bypassed with OPEN_URLS)
 # or READ_ONLY (read only access to views)
 AUTH_STRATEGY = 'READ_ONLY'
 
@@ -330,8 +330,8 @@ TARGET_LIST_COLUMNS = [
     "name", "type", "observations", "saved_data"
 ]
 
-# URLs that should be allowed access even with AUTH_STRATEGY = LOCKED
-# for example: OPEN_URLS = ['/', '/about']
+# URLs that should be allowed access even with AUTH_STRATEGY = LOCKED. Can use wildcards.
+# for example: OPEN_URLS = ['/', '/about', '/accounts/reset/*/']
 OPEN_URLS = []
 
 HOOKS = {

{tomtoolkit-2.31.2 → tomtoolkit-2.31.4}/tom_catalogs/harvesters/jplhorizons.py

@@ -27,7 +27,13 @@ class JPLHorizonsHarvester(AbstractHarvester):
     def to_target(self):
         target = super().to_target()
         target.type = 'NON_SIDEREAL'
-        target.scheme = 'MPC_MINOR_PLANET'
+        # Special case for ingesting asteroids as comets, see tom_base #1180
+        target.eccentricity = self.catalog_data['e'][0]  # eccentricity in JPL
+        target.epoch_of_perihelion = self.jd_to_mjd(self.catalog_data['Tp_jd'][0])  # time of periapsis in JPL
+        if target.eccentricity > 0.9 and target.epoch_of_perihelion is not None and target.epoch_of_perihelion != 0:
+            target.scheme = 'MPC_COMET'
+        else:
+            target.scheme = 'MPC_MINOR_PLANET'
         asteroid = True
         if 'M1' in self.catalog_data.colnames and 'k1' in self.catalog_data.colnames:
             asteroid = False
@@ -47,10 +53,8 @@ class JPLHorizonsHarvester(AbstractHarvester):
         target.inclination = self.catalog_data['incl'][0]  # inclination in JPL
         target.mean_daily_motion = self.catalog_data['n'][0]  # mean motion in JPL
         target.semimajor_axis = self.catalog_data['a'][0]  # semi-major axis in JPL
-        target.eccentricity = self.catalog_data['e'][0]  # eccentricity in JPL
         # epoch Julian Date in JPL
         target.epoch_of_elements = self.jd_to_mjd(self.catalog_data['datetime_jd'][0])
-        target.epoch_of_perihelion = self.jd_to_mjd(self.catalog_data['Tp_jd'][0])  # time of periapsis in JPL
         target.perihdist = self.catalog_data['q'][0]  # periapsis distance in JPL
         # undocumented in JPL astroquery column names -- presuming P is the orbital period in JPL
         target.ephemeris_period = self.catalog_data['P'][0]

{tomtoolkit-2.31.2 → tomtoolkit-2.31.4}/tom_common/middleware.py

@@ -1,3 +1,4 @@
+import fnmatch
 from django.conf import settings
 from django.contrib import messages
 from django.http import HttpResponseForbidden
@@ -35,11 +36,13 @@ class AuthStrategyMiddleware:
         self.open_urls = [reverse('login')] + getattr(settings, 'OPEN_URLS', [])
 
     def __call__(self, request):
-        if settings.AUTH_STRATEGY == 'LOCKED':
-            if not request.user.is_authenticated and request.path_info not in self.open_urls:
-                return HttpResponseForbidden()
-
-        return self.get_response(request)
+        if settings.AUTH_STRATEGY == 'LOCKED' and not request.user.is_authenticated:
+            for url in self.open_urls:
+                if fnmatch.fnmatch(request.path_info, url):
+                    return self.get_response(request)
+            return HttpResponseForbidden()
+        else:
+            return self.get_response(request)
 
 
 class Raise403Middleware:

{tomtoolkit-2.31.2 → tomtoolkit-2.31.4}/tom_common/session_utils.py

@@ -242,7 +242,7 @@ def reencrypt_data(user) -> None:
     logger.debug("Re-encrypting sensitive data...")
 
     #  Get the current Session from the UserSession
-    user_session = UserSession.objects.filter(user=user).first()  # see comment above
+    user_session = UserSession.objects.filter(user=user.id).first()  # see comment above
 
     if not user_session:
         logger.warning(f"User {user.username} is not logged in. Cannot re-encrypt sensitive data. "

{tomtoolkit-2.31.2 → tomtoolkit-2.31.4}/tom_common/templates/tom_common/partials/navbar_login.html

@@ -9,10 +9,13 @@
     {% endif %}
 </li>
 <li>
-    <a class="btn btn-outline-success" title="logout" href="{% url 'logout' %}">Logout</a>
+    <form method="post" action="{% url 'logout' %}">
+        {% csrf_token %}
+        <button class="btn btn-outline-success" title="Logout" type="submit">Logout</button>
+    </form>
 </li>
 {% else %}
 <li class="nav-item">
-    <a class="btn btn-outline-success" title="logout" href="{% url 'login' %}">Login</a>
+    <a class="btn btn-outline-success" title="Login" href="{% url 'login' %}">Login</a>
 </li>
 {% endif %}

{tomtoolkit-2.31.2 → tomtoolkit-2.31.4}/tom_common/tests.py

@@ -247,6 +247,49 @@ class TestAuthScheme(TestCase):
         self.assertContains(response, 'Create Targets')
 
 
+class TestAuthStrategyMiddleware(TestCase):
+    login_url = '/accounts/login/'
+
+    @override_settings(AUTH_STRATEGY='LOCKED', OPEN_URLS=[])
+    def test_locked_unauthenticated_request_redirects_to_login(self):
+        # Raise403Middleware converts the 403 from AuthStrategyMiddleware to a redirect
+        response = self.client.get(reverse('tom_targets:list'))
+        self.assertRedirects(
+            response, self.login_url + '?next=' + reverse('tom_targets:list'), status_code=302
+        )
+
+    @override_settings(AUTH_STRATEGY='LOCKED', OPEN_URLS=['/accounts/reset/*/'])
+    def test_locked_password_reset_wildcard_matches_uid_token(self):
+        # /accounts/reset/abc123xyz/ should match the wildcard
+        response = self.client.get('/accounts/reset/abc123xyz/foobarfoo/')
+        self.assertNotEqual(response.status_code, 302)
+
+    @override_settings(AUTH_STRATEGY='LOCKED', OPEN_URLS=['/accounts/reset/*/'])
+    def test_locked_password_reset_wildcard_does_not_match_unrelated_path(self):
+        # /accounts/profile/ should not match /accounts/reset/*/
+        response = self.client.get('/accounts/profile/')
+        self.assertRedirects(
+            response, self.login_url + '?next=/accounts/profile/', status_code=302
+        )
+
+    @override_settings(AUTH_STRATEGY='LOCKED', OPEN_URLS=[])
+    def test_locked_login_url_always_open(self):
+        response = self.client.get(reverse('login'))
+        self.assertNotEqual(response.status_code, 302)
+
+    @override_settings(AUTH_STRATEGY='LOCKED', OPEN_URLS=[])
+    def test_locked_authenticated_user_allowed(self):
+        user = User.objects.create_user(username='testuser', password='password')
+        self.client.force_login(user)
+        response = self.client.get(reverse('tom_targets:list'))
+        self.assertEqual(response.status_code, 200)
+
+    @override_settings(AUTH_STRATEGY='READ_ONLY', OPEN_URLS=[])
+    def test_read_only_unauthenticated_allowed(self):
+        response = self.client.get(reverse('tom_targets:list'))
+        self.assertEqual(response.status_code, 200)
+
+
 class CommentDeleteViewTest(TestCase):
     def setUp(self):
         self.site = Site.objects.get_current()

{tomtoolkit-2.31.2 → tomtoolkit-2.31.4}/tom_observations/facilities/lco_redirect.py

@@ -122,3 +122,6 @@ class LCORedirectFacility(BaseRedirectObservationFacility):
             observation_group.observation_records.add(obs_record)
 
         return observation_group
+
+    def get_facility_status(self):
+        return self.lco_facility.get_facility_status()

{tomtoolkit-2.31.2 → tomtoolkit-2.31.4}/tom_setup/templates/tom_setup/settings.tmpl

@@ -328,7 +328,7 @@ GENERAL_SEARCH_FUNCTIONS = {}
 # This list can be used to add custom target parameters to the output from the target selection tool
 SELECTION_EXTRA_FIELDS = []
 
-# Authentication strategy can either be LOCKED (required login for all views)
+# Authentication strategy can either be LOCKED (required login for all views, bypassed with OPEN_URLS)
 # or READ_ONLY (read only access to views)
 AUTH_STRATEGY = 'READ_ONLY'
 
@@ -348,8 +348,8 @@ TARGET_LIST_COLUMNS = [
     "name", "type", "observations", "saved_data"
 ]
 
-# URLs that should be allowed access even with AUTH_STRATEGY = LOCKED
-# for example: OPEN_URLS = ['/', '/about']
+# URLs that should be allowed access even with AUTH_STRATEGY = LOCKED. Can use wildcards.
+# for example: OPEN_URLS = ['/', '/about', '/accounts/reset/*/']
 OPEN_URLS = []
 
 HOOKS = {

{tomtoolkit-2.31.2 → tomtoolkit-2.31.4}/tom_targets/forms.py

@@ -161,8 +161,15 @@ class NonSiderealTargetCreateForm(TargetForm):
         """
         cleaned_data = super().clean()
         scheme = cleaned_data['scheme']  # scheme is a required field, so this should be safe
+        eccentricity = cleaned_data.get('eccentricity')
         required_fields = REQUIRED_NON_SIDEREAL_FIELDS_PER_SCHEME[scheme]
 
+        # Check that eccentiricty isn't too high for a non-comet orbital scheme.
+        if eccentricity and eccentricity > 0.9 and scheme != 'MPC_COMET':
+            raise ValidationError(
+                    "High eccentricity objects should use the MPC_COMET scheme to ensure proper orbital calculations."
+                )
+
         for field in required_fields:
             if not cleaned_data.get(field):
                 # Get verbose names of required fields

{tomtoolkit-2.31.2 → tomtoolkit-2.31.4}/tom_targets/tests/tests.py

@@ -428,7 +428,7 @@ class TestTargetCreate(TestCase):
             'epoch_of_elements': 100,
             'lng_asc_node': 100,
             'arg_of_perihelion': 100,
-            'eccentricity': 100,
+            'eccentricity': .1,
             'mean_anomaly': 100,
             'inclination': 100,
             'semimajor_axis': 100,
@@ -1878,8 +1878,8 @@ class TestTargetMerge(TestCase):
 
         # after we run merge --> TL1, TL2, and TL3 each should only contain st1
         target_merge(self.st1, self.st2)
-        self.assertQuerysetEqual(targetlist1.targets.all(), targetlist2.targets.all())
-        self.assertQuerysetEqual(targetlist1.targets.all(), targetlist3.targets.all())
+        self.assertQuerySetEqual(targetlist1.targets.all(), targetlist2.targets.all())
+        self.assertQuerySetEqual(targetlist1.targets.all(), targetlist3.targets.all())
         self.assertEqual(self.st1.targetlist_set.all().count(), 3)
 
     def test_merge_data_products(self):
@@ -1963,7 +1963,7 @@ class TestTargetMerge(TestCase):
         # write a test where the primary target extra queryset matches the expected queryset
         expected_queryset1 = st1_te + st2_te[1:]
         target_merge(self.st1, self.st2)
-        self.assertQuerysetEqual(list(self.st1.targetextra_set.all()), expected_queryset1, ordered=False)
+        self.assertQuerySetEqual(list(self.st1.targetextra_set.all()), expected_queryset1, ordered=False)
         self.assertEqual(self.st1.targetextra_set.count(), 5)
 
     def test_merge_observation_records(self):

tomtoolkit-2.31.2/.git/FETCH_HEAD

@@ -1 +0,0 @@
-951ff38f38e975f335b10c4a96525beeddfd2428		'951ff38f38e975f335b10c4a96525beeddfd2428' of https://github.com/TOMToolkit/tom_base

tomtoolkit-2.31.2/.git/HEAD

@@ -1 +0,0 @@
-951ff38f38e975f335b10c4a96525beeddfd2428

tomtoolkit-2.31.2/.git/logs/HEAD

@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 951ff38f38e975f335b10c4a96525beeddfd2428 runner <runner@runnervmwffz4.t1f0yj35bwtujcp2bpd3c1kvda.yx.internal.cloudapp.net> 1771962509 +0000	checkout: moving from master to refs/tags/2.31.2

tomtoolkit-2.31.2/.git/refs/tags/2.31.2

@@ -1 +0,0 @@
-951ff38f38e975f335b10c4a96525beeddfd2428

tomtoolkit-2.31.2/.git/shallow

@@ -1 +0,0 @@
-951ff38f38e975f335b10c4a96525beeddfd2428