From 00c1fb2d93916591b84bcdd573ae6fb5cf18cb8e Mon Sep 17 00:00:00 2001 From: William O'Mullane Date: Wed, 29 Oct 2025 18:18:12 -0300 Subject: [PATCH 1/3] bump sims --- requirements/dev.txt | 6 +- requirements/main.txt | 223 +++++++++++++++++++++++------------------- 2 files changed, 128 insertions(+), 101 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index abe85cc..cdb2e68 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -590,7 +590,7 @@ typing-inspection==0.4.2 \ # via # -c requirements/main.txt # pydantic -virtualenv==20.35.3 \ - --hash=sha256:4f1a845d131133bdff10590489610c98c168ff99dc75d6c96853801f7f67af44 \ - --hash=sha256:63d106565078d8c8d0b206d48080f938a8b25361e19432d2c9db40d2899c810a +virtualenv==20.35.4 \ + --hash=sha256:643d3914d73d3eeb0c552cbb12d7e82adf0e504dbf86a3182f8771a153a1971c \ + --hash=sha256:c21c9cede36c9753eeade68ba7d523529f228a403463376cf821eaae2b650f1b # via pre-commit diff --git a/requirements/main.txt b/requirements/main.txt index e0fabb3..0000670 100644 --- a/requirements/main.txt +++ b/requirements/main.txt @@ -37,9 +37,9 @@ aiokafka==0.12.0 \ --hash=sha256:fdbd69ec70eea4a8dfaa5c35ff4852e90e1277fcc426b9380f0b499b77f13b16 \ --hash=sha256:ff63689cafcd6dd642a15de75b7ae121071d6162cccba16d091bcb28b3886307 # via -r requirements/main.in -alembic[tz]==1.17.0 \ - --hash=sha256:4652a0b3e19616b57d652b82bfa5e38bf5dbea0813eed971612671cb9e90c0fe \ - --hash=sha256:80523bc437d41b35c5db7e525ad9d908f79de65c27d6a5a5eab6df348a352d99 +alembic[tz]==1.17.1 \ + --hash=sha256:8a289f6778262df31571d29cca4c7fbacd2f0f582ea0816f4c399b6da7528486 \ + --hash=sha256:cbc2386e60f89608bb63f30d2d6cc66c7aaed1fe105bd862828600e5ad167023 # via safir annotated-doc==0.0.3 \ --hash=sha256:348ec6664a76f1fd3be81f43dffbee4c7e8ce931ba71ec67cc7f4ade7fbbb580 \ @@ -559,13 +559,12 @@ db==0.1.1 \ db-sqlite3==0.0.1 \ --hash=sha256:4dd410aa28a2c5b66de477f9dc62f523133217dd31c7ed7eb085214bea148db9 # via -r requirements/main.in -deprecated==1.2.18 \ - --hash=sha256:422b6f6d859da6f2ef57857761bfb392480502a64c3028ca9bbe86085d72115d \ - --hash=sha256:bd5011788200372a32418f888e326a09ff80d0214bd961147cfed01b5c018eec +deprecated==1.3.0 \ + --hash=sha256:0efaf13de8bd3f3f86d88f6e1001d3982dae6e64b85302b60230de4d047387bd # via lsst-utils -fastapi==0.120.1 \ - --hash=sha256:0e8a2c328e96c117272d8c794d3a97d205f753cc2e69dd7ee387b7488a75601f \ - --hash=sha256:b5c6217e9ddca6dfcf54c97986180d4a1955e10c693d74943fc5327700178bff +fastapi==0.120.2 \ + --hash=sha256:4c5ab43e2a90335bbd8326d1b659eac0f3dbcc015e2af573c4f5de406232c4ac \ + --hash=sha256:bedcf2c14240e43d56cb9a339b32bcf15104fe6b5897c0222603cb7ec416c8eb # via # -r requirements/main.in # safir @@ -1997,9 +1996,9 @@ rubin-scheduler==3.19.0 \ --hash=sha256:68ce455b32141be695013a98b95685093ba5df8ee95b7c4f73efa3a40cfd2a83 \ --hash=sha256:b304ec8eb23a525e5379321278ca0b71bb19e5a99074815a457b2cb54f434ff2 # via rubin-sim -rubin-sim==2.5.0 \ - --hash=sha256:909be4a4e53474cabf610f752ff5119a8ed4443434ef9a48eb751fca320a6ea5 \ - --hash=sha256:e7bcd4e81103b217e778d0e7249c784cbf21f069bcd4734e4bc1f5bd0c590fb9 +rubin-sim==2.5.2 \ + --hash=sha256:6f2602e40bfdeb15be6c32379b803abe103e3f7a5ed6c8c87c3560291b5a2f12 \ + --hash=sha256:889cd68fe00b5de8907b8576022db6eee3bc77766e2293c96b79f01c56405cac # via -r requirements/main.in s3transfer==0.14.0 \ --hash=sha256:ea3b790c7077558ed1f02a3072fb3cb992bbbd253392f4b6e9e8976941c7d456 \ @@ -2045,7 +2044,9 @@ scikit-learn==1.7.2 \ --hash=sha256:e5bf3d930aee75a65478df91ac1225ff89cd28e9ac7bd1196853a9229b6adb0b \ --hash=sha256:f95dc55b7902b91331fa4e5845dd5bde0580c9cd9612b1b2791b7e80c3d32615 \ --hash=sha256:fa8f63940e29c82d1e67a45d5297bdebbcb585f5a5a50c4914cc2e852ab77f33 - # via -r requirements/main.in + # via + # -r requirements/main.in + # rubin-sim scipy==1.16.3 \ --hash=sha256:0151a0749efeaaab78711c78422d413c583b8cdd2011a3c1d6c794938ee9fdb2 \ --hash=sha256:01e87659402762f43bd2fee13370553a17ada367d42e7487800bf2916535aecb \ @@ -2112,9 +2113,9 @@ scipy==1.16.3 \ # rubin-scheduler # rubin-sim # scikit-learn -sentry-sdk==2.42.1 \ - --hash=sha256:8598cc6edcfe74cb8074ba6a7c15338cdee93d63d3eb9b9943b4b568354ad5b6 \ - --hash=sha256:f8716b50c927d3beb41bc88439dc6bcd872237b596df5b14613e2ade104aee02 +sentry-sdk==2.43.0 \ + --hash=sha256:4aacafcf1756ef066d359ae35030881917160ba7f6fc3ae11e0e58b09edc2d5d \ + --hash=sha256:52ed6e251c5d2c084224d73efee56b007ef5c2d408a4a071270e82131d336e20 # via safir sgp4==2.25 \ --hash=sha256:036df88b7cfebdea8b1ff7ce6497db08526978d879a8a63f4ed681454faf92c3 \ @@ -2405,88 +2406,114 @@ uvicorn==0.38.0 \ --hash=sha256:48c0afd214ceb59340075b4a052ea1ee91c16fbc2a9b1469cca0e54566977b02 \ --hash=sha256:fd97093bdd120a2609fc0d3afe931d4d4ad688b6e75f0f929fde1bc36fe0e91d # via -r requirements/main.in -wrapt==1.17.3 \ - --hash=sha256:02b551d101f31694fc785e58e0720ef7d9a10c4e62c1c9358ce6f63f23e30a56 \ - --hash=sha256:042ec3bb8f319c147b1301f2393bc19dba6e176b7da446853406d041c36c7828 \ - --hash=sha256:0610b46293c59a3adbae3dee552b648b984176f8562ee0dba099a56cfbe4df1f \ - --hash=sha256:0b02e424deef65c9f7326d8c19220a2c9040c51dc165cddb732f16198c168396 \ - --hash=sha256:0b1831115c97f0663cb77aa27d381237e73ad4f721391a9bfb2fe8bc25fa6e77 \ - --hash=sha256:0ed61b7c2d49cee3c027372df5809a59d60cf1b6c2f81ee980a091f3afed6a2d \ - --hash=sha256:0f5f51a6466667a5a356e6381d362d259125b57f059103dd9fdc8c0cf1d14139 \ - --hash=sha256:16ecf15d6af39246fe33e507105d67e4b81d8f8d2c6598ff7e3ca1b8a37213f7 \ - --hash=sha256:1f0b2f40cf341ee8cc1a97d51ff50dddb9fcc73241b9143ec74b30fc4f44f6cb \ - --hash=sha256:1f23fa283f51c890eda8e34e4937079114c74b4c81d2b2f1f1d94948f5cc3d7f \ - --hash=sha256:223db574bb38637e8230eb14b185565023ab624474df94d2af18f1cdb625216f \ - --hash=sha256:249f88ed15503f6492a71f01442abddd73856a0032ae860de6d75ca62eed8067 \ - --hash=sha256:24c2ed34dc222ed754247a2702b1e1e89fdbaa4016f324b4b8f1a802d4ffe87f \ - --hash=sha256:273a736c4645e63ac582c60a56b0acb529ef07f78e08dc6bfadf6a46b19c0da7 \ - --hash=sha256:281262213373b6d5e4bb4353bc36d1ba4084e6d6b5d242863721ef2bf2c2930b \ - --hash=sha256:30ce38e66630599e1193798285706903110d4f057aab3168a34b7fdc85569afc \ - --hash=sha256:33486899acd2d7d3066156b03465b949da3fd41a5da6e394ec49d271baefcf05 \ - --hash=sha256:343e44b2a8e60e06a7e0d29c1671a0d9951f59174f3709962b5143f60a2a98bd \ - --hash=sha256:373342dd05b1d07d752cecbec0c41817231f29f3a89aa8b8843f7b95992ed0c7 \ - --hash=sha256:3af60380ba0b7b5aeb329bc4e402acd25bd877e98b3727b0135cb5c2efdaefe9 \ - --hash=sha256:3e62d15d3cfa26e3d0788094de7b64efa75f3a53875cdbccdf78547aed547a81 \ - --hash=sha256:41b1d2bc74c2cac6f9074df52b2efbef2b30bdfe5f40cb78f8ca22963bc62977 \ - --hash=sha256:423ed5420ad5f5529db9ce89eac09c8a2f97da18eb1c870237e84c5a5c2d60aa \ - --hash=sha256:46acc57b331e0b3bcb3e1ca3b421d65637915cfcd65eb783cb2f78a511193f9b \ - --hash=sha256:4da9f45279fff3543c371d5ababc57a0384f70be244de7759c85a7f989cb4ebe \ - --hash=sha256:507553480670cab08a800b9463bdb881b2edeed77dc677b0a5915e6106e91a58 \ - --hash=sha256:53e5e39ff71b3fc484df8a522c933ea2b7cdd0d5d15ae82e5b23fde87d44cbd8 \ - --hash=sha256:54a30837587c6ee3cd1a4d1c2ec5d24e77984d44e2f34547e2323ddb4e22eb77 \ - --hash=sha256:5531d911795e3f935a9c23eb1c8c03c211661a5060aab167065896bbf62a5f85 \ - --hash=sha256:55cbbc356c2842f39bcc553cf695932e8b30e30e797f961860afb308e6b1bb7c \ - --hash=sha256:59923aa12d0157f6b82d686c3fd8e1166fa8cdfb3e17b42ce3b6147ff81528df \ - --hash=sha256:5a03a38adec8066d5a37bea22f2ba6bbf39fcdefbe2d91419ab864c3fb515454 \ - --hash=sha256:5a7b3c1ee8265eb4c8f1b7d29943f195c00673f5ab60c192eba2d4a7eae5f46a \ - --hash=sha256:5d4478d72eb61c36e5b446e375bbc49ed002430d17cdec3cecb36993398e1a9e \ - --hash=sha256:5ea5eb3c0c071862997d6f3e02af1d055f381b1d25b286b9d6644b79db77657c \ - --hash=sha256:604d076c55e2fdd4c1c03d06dc1a31b95130010517b5019db15365ec4a405fc6 \ - --hash=sha256:656873859b3b50eeebe6db8b1455e99d90c26ab058db8e427046dbc35c3140a5 \ - --hash=sha256:65d1d00fbfb3ea5f20add88bbc0f815150dbbde3b026e6c24759466c8b5a9ef9 \ - --hash=sha256:6b538e31eca1a7ea4605e44f81a48aa24c4632a277431a6ed3f328835901f4fd \ - --hash=sha256:6fd1ad24dc235e4ab88cda009e19bf347aabb975e44fd5c2fb22a3f6e4141277 \ - --hash=sha256:70d86fa5197b8947a2fa70260b48e400bf2ccacdcab97bb7de47e3d1e6312225 \ - --hash=sha256:7171ae35d2c33d326ac19dd8facb1e82e5fd04ef8c6c0e394d7af55a55051c22 \ - --hash=sha256:73d496de46cd2cdbdbcce4ae4bcdb4afb6a11234a1df9c085249d55166b95116 \ - --hash=sha256:7425ac3c54430f5fc5e7b6f41d41e704db073309acfc09305816bc6a0b26bb16 \ - --hash=sha256:74afa28374a3c3a11b3b5e5fca0ae03bef8450d6aa3ab3a1e2c30e3a75d023dc \ - --hash=sha256:758895b01d546812d1f42204bd443b8c433c44d090248bf22689df673ccafe00 \ - --hash=sha256:79573c24a46ce11aab457b472efd8d125e5a51da2d1d24387666cd85f54c05b2 \ - --hash=sha256:7e18f01b0c3e4a07fe6dfdb00e29049ba17eadbc5e7609a2a3a4af83ab7d710a \ - --hash=sha256:88547535b787a6c9ce4086917b6e1d291aa8ed914fdd3a838b3539dc95c12804 \ - --hash=sha256:88bbae4d40d5a46142e70d58bf664a89b6b4befaea7b2ecc14e03cedb8e06c04 \ - --hash=sha256:8cccf4f81371f257440c88faed6b74f1053eef90807b77e31ca057b2db74edb1 \ - --hash=sha256:9baa544e6acc91130e926e8c802a17f3b16fbea0fd441b5a60f5cf2cc5c3deba \ - --hash=sha256:a36692b8491d30a8c75f1dfee65bef119d6f39ea84ee04d9f9311f83c5ad9390 \ - --hash=sha256:a47681378a0439215912ef542c45a783484d4dd82bac412b71e59cf9c0e1cea0 \ - --hash=sha256:a7c06742645f914f26c7f1fa47b8bc4c91d222f76ee20116c43d5ef0912bba2d \ - --hash=sha256:a9a2203361a6e6404f80b99234fe7fb37d1fc73487b5a78dc1aa5b97201e0f22 \ - --hash=sha256:ab232e7fdb44cdfbf55fc3afa31bcdb0d8980b9b95c38b6405df2acb672af0e0 \ - --hash=sha256:ad85e269fe54d506b240d2d7b9f5f2057c2aa9a2ea5b32c66f8902f768117ed2 \ - --hash=sha256:af338aa93554be859173c39c85243970dc6a289fa907402289eeae7543e1ae18 \ - --hash=sha256:afd964fd43b10c12213574db492cb8f73b2f0826c8df07a68288f8f19af2ebe6 \ - --hash=sha256:b32888aad8b6e68f83a8fdccbf3165f5469702a7544472bdf41f582970ed3311 \ - --hash=sha256:c31eebe420a9a5d2887b13000b043ff6ca27c452a9a22fa71f35f118e8d4bf89 \ - --hash=sha256:caea3e9c79d5f0d2c6d9ab96111601797ea5da8e6d0723f77eabb0d4068d2b2f \ - --hash=sha256:cf30f6e3c077c8e6a9a7809c94551203c8843e74ba0c960f4a98cd80d4665d39 \ - --hash=sha256:d40770d7c0fd5cbed9d84b2c3f2e156431a12c9a37dc6284060fb4bec0b7ffd4 \ - --hash=sha256:d8a210b158a34164de8bb68b0e7780041a903d7b00c87e906fb69928bf7890d5 \ - --hash=sha256:dc4a8d2b25efb6681ecacad42fca8859f88092d8732b170de6a5dddd80a1c8fa \ - --hash=sha256:df7d30371a2accfe4013e90445f6388c570f103d61019b6b7c57e0265250072a \ - --hash=sha256:e01375f275f010fcbf7f643b4279896d04e571889b8a5b3f848423d91bf07050 \ - --hash=sha256:e1a4120ae5705f673727d3253de3ed0e016f7cd78dc463db1b31e2463e1f3cf6 \ - --hash=sha256:e228514a06843cae89621384cfe3a80418f3c04aadf8a3b14e46a7be704e4235 \ - --hash=sha256:e405adefb53a435f01efa7ccdec012c016b5a1d3f35459990afc39b6be4d5056 \ - --hash=sha256:e6b13af258d6a9ad602d57d889f83b9d5543acd471eee12eb51f5b01f8eb1bc2 \ - --hash=sha256:e6f40a8aa5a92f150bdb3e1c44b7e98fb7113955b2e5394122fa5532fec4b418 \ - --hash=sha256:e71d5c6ebac14875668a1e90baf2ea0ef5b7ac7918355850c0908ae82bcb297c \ - --hash=sha256:ed7c635ae45cfbc1a7371f708727bf74690daedc49b4dba310590ca0bd28aa8a \ - --hash=sha256:f38e60678850c42461d4202739f9bf1e3a737c7ad283638251e79cc49effb6b6 \ - --hash=sha256:f66eb08feaa410fe4eebd17f2a2c8e2e46d3476e9f8c783daa8e09e0faa666d0 \ - --hash=sha256:f9b2601381be482f70e5d1051a5965c25fb3625455a2bf520b5a077b22afb775 \ - --hash=sha256:fbd3c8319de8e1dc79d346929cd71d523622da527cca14e0c1d257e31c2b8b10 \ - --hash=sha256:fd341868a4b6714a5962c1af0bd44f7c404ef78720c7de4892901e540417111c +wrapt==2.0.0 \ + --hash=sha256:02482fb0df89857e35427dfb844319417e14fae05878f295ee43fa3bf3b15502 \ + --hash=sha256:028f19ec29e204fe725139d4a8b09f77ecfb64f8f02b7ab5ee822c85e330b68b \ + --hash=sha256:03442f2b45fa3f2b98a94a1917f52fb34670de8f96c0a009c02dbd512d855a3d \ + --hash=sha256:04c7c8393f25b11c0faa5d907dd9eb462e87e4e7ba55e308a046d7ed37f4bbe2 \ + --hash=sha256:04f7a5f92c5f7324a1735043cc467b1295a1c5b4e0c1395472b7c44706e3dc61 \ + --hash=sha256:057f02c13cce7b26c79624c06a3e1c2353e6dc9708525232232f6768118042ca \ + --hash=sha256:06b78cb6b9320f57737a52fede882640d93cface98332d1a3df0c5696ec9ae9f \ + --hash=sha256:094d348ce7e6ce37bf6ed9a6ecc11886c96f447b3ffebc7539ca197daa9a997e \ + --hash=sha256:0a921b657a224e40e4bc161b5d33934583b34f0c9c5bdda4e6ac66f9d2fcb849 \ + --hash=sha256:0b9ad4fab76a0086dc364c4f17f39ad289600e73ef5c6e9ab529aff22cac1ac3 \ + --hash=sha256:1147a84c8fc852426580af8b6e33138461ddbc65aa459a25ea539374d32069fa \ + --hash=sha256:12c37784b77bf043bf65cc96c7195a5db474b8e54173208af076bdbb61df7b3e \ + --hash=sha256:1316972a72c67936a07dbb48e2464356d91dd9674335aaec087b60094d87750b \ + --hash=sha256:1724dd7b84d419c80ba839da81ad78b02ac30df626e5aefcb18e94632a965f13 \ + --hash=sha256:17ba1bdc52d0c783481850996aa26cea5237720769197335abea2ae6b4c23bc0 \ + --hash=sha256:17d0b5c42495ba142a1cee52b76414f9210591c84aae94dffda70240753bfb3c \ + --hash=sha256:1a91075a5383a7cbfe46aed1845ef7c3f027e8e20e7d9a8a75e36ebc9b0dd15e \ + --hash=sha256:1fd4c95536975895f32571073446e614d5e2810b666b64955586dcddfd438fd3 \ + --hash=sha256:2356f76cb99b3de5b4e5b8210367fbbb81c7309fe39b622f5d199dd88eb7f765 \ + --hash=sha256:2b79bf04c722035b1c474980dc1a64369feab7b703d6fe67da2d8664ed0bc980 \ + --hash=sha256:2ca35b83497276c2ca0b072d2c00da2edde4c2a6c8c650eafcd1a006c17ab231 \ + --hash=sha256:2fc55d0da29318a5da33c2827aef8946bba046ac609a4784a90faff73c511174 \ + --hash=sha256:309dd467a94ee38a7aa5752bda64e660aeab5723b26200d0b65a375dad9add09 \ + --hash=sha256:35a542cc7a962331d0279735c30995b024e852cf40481e384fd63caaa391cbb9 \ + --hash=sha256:39c5b45b056d630545e40674d1f5e1b51864b3546f25ab6a4a331943de96262e \ + --hash=sha256:3c7d3bee7be7a2665286103f4d1f15405c8074e6e1f89dac5774f9357c9a3809 \ + --hash=sha256:3e02ab8c0ac766a5a6e81cd3b6cc39200c69051826243182175555872522bd5a \ + --hash=sha256:43dc0550ae15e33e6bb45a82a5e1b5495be2587fbaa996244b509921810ee49f \ + --hash=sha256:49e982b7860d325094978292a49e0418833fc7fc42c0dc7cd0b7524d7d06ee74 \ + --hash=sha256:52878edc13dc151c58a9966621d67163a80654bc6cff4b2e1c79fa62d0352b26 \ + --hash=sha256:59dc94afc4542c7d9b9447fb2ae1168b5a29064eca4061dbbf3b3c26df268334 \ + --hash=sha256:5aad54ff45da9784573099696fd84841c7e559ce312f02afa6aa7e89b58e2c2f \ + --hash=sha256:5d3ebd784804f146b7ea55359beb138e23cc18e5a5cc2cf26ad438723c00ce3a \ + --hash=sha256:5d6691d4a711504a0bc10de789842ad6ac627bed22937b10f37a1211a8ab7bb3 \ + --hash=sha256:5e09ffd31001dce71c2c2a4fc201bdba9a2f9f62b23700cf24af42266e784741 \ + --hash=sha256:623242959cb0c53f76baeb929be79f5f6a9a1673ef51628072b91bf299af2212 \ + --hash=sha256:65f50e356c425c061e1e17fe687ff30e294fed9bf3441dc1f13ef73859c2a817 \ + --hash=sha256:680f707e1d26acbc60926659799b15659f077df5897a6791c7c598a5d4a211c4 \ + --hash=sha256:6e5c86389d9964050ce50babe247d172a5e3911d59a64023b90db2b4fa00ae7c \ + --hash=sha256:73c6f734aecb1a030d9a265c13a425897e1ea821b73249bb14471445467ca71c \ + --hash=sha256:75e5c049eb583835f7a0e0e311d9dde9bfbaac723a6dd89d052540f9b2809977 \ + --hash=sha256:79a53d86c2aff7b32cc77267e3a308365d1fcb881e74bc9cbe26f63ee90e37f0 \ + --hash=sha256:79bdd84570267f3f43d609c892ae2d30b91ee4b8614c2cbfd311a2965f1c9bdb \ + --hash=sha256:7a0efbbc06d3e2077476a04f55859819d23206600b4c33f791359a8e6fa3c362 \ + --hash=sha256:7fec8a9455c029c8cf4ff143a53b6e7c463268d42be6c17efa847ebd2f809965 \ + --hash=sha256:804e88f824b76240a1b670330637ccfd2d18b9efa3bb4f02eb20b2f64880b324 \ + --hash=sha256:806e2e73186eb5e3546f39fb5d0405040e0088db0fc8b2f667fd1863de2b3c99 \ + --hash=sha256:81d234718aabe632d179fac52c7f69f0f99fbaac4d4bcd670e62462bbcbfcad7 \ + --hash=sha256:827e6e3a3a560f6ec1f5ee92d4319c21a0549384f896ec692f3201eda31ebd11 \ + --hash=sha256:829c8d46465dbae49dba91516f11200a2b5ea91eae8afaccbc035f0b651eb9c4 \ + --hash=sha256:887f2a667e3cbfb19e204032d42ad7dedaa43972e4861dc7a3d51ae951d9b578 \ + --hash=sha256:895870602d65d7338edb3b6a717d856632ad9f14f7ff566214e4fb11f0816649 \ + --hash=sha256:8c8349ebfc3cd98bc9105e0112dd8c8ac1f3c7cb5601f9d02248cae83a63f748 \ + --hash=sha256:8d851e526891216f89fcb7a1820dad9bd503ba3468fb9635ee28e93c781aa98e \ + --hash=sha256:8e08d4edb13cafe7b3260f31d4de033f73d3205774540cf583bffaa4bec97db9 \ + --hash=sha256:9054829da4be461e3ad3192e4b6bbf1fc18af64c9975ce613aec191924e004dc \ + --hash=sha256:93c8b4f4d54fd401a817abbfc9bf482aa72fd447f8adf19ce81d035b3f5c762c \ + --hash=sha256:93cb5bff1fcd89b75f869e4f69566a91ab2c9f13e8edf0241fd5777b2fa6d48e \ + --hash=sha256:98223acaa25b1449d993a3f4ffc8b5a03535e4041b37bf6a25459a0c74ee4cfc \ + --hash=sha256:9b15940ae9debc8b40b15dc57e1ce4433f7fb9d3f8761c7fab1ddd94cb999d99 \ + --hash=sha256:9c100b0598f3763274f2033bcc0454de7486409f85bc6da58b49e5971747eb36 \ + --hash=sha256:9d72c725cefbcc8ebab85c8352e5062ae87b6e323858e934e16b54ced580435a \ + --hash=sha256:9e070c3491397fba0445b8977900271eca9656570cca7c900d9b9352186703a0 \ + --hash=sha256:a1cb62f686c50e9dab5983c68f6c8e9cbf14a6007935e683662898a7d892fa69 \ + --hash=sha256:a55e8edd08e2eece131d90d82cd1521962d9152829b22c56e68539526d605825 \ + --hash=sha256:a7cebcee61f21b1e46aa32db8d9d93826d0fbf1ad85defc2ccfb93b4adef1435 \ + --hash=sha256:a93e0f8b376c0735b2f4daf58018b4823614d2b896cb72b6641c4d3dbdca1d75 \ + --hash=sha256:ac3d8beac68e4863c703b844fcc82693f83f933b37d2a54e9d513b2aab9c76aa \ + --hash=sha256:af01695c2b7bbd8d67b869d8e3de2b123a7bfbee0185bdd138c2775f75373b83 \ + --hash=sha256:b42d13603da4416c43c430dbc6313c8d7ff745c40942f146ed4f6dd02c7d2547 \ + --hash=sha256:b4a7f8023b8ce8a36370154733c747f8d65c8697cb977d8b6efeb89291fff23e \ + --hash=sha256:b6a18c813196e18146b8d041e20875bdb0cb09b94ac1d1e1146e0fa87b2deb0d \ + --hash=sha256:b7e221abb6c5387819db9323dac3c875b459695057449634f1111955d753c621 \ + --hash=sha256:b952ffd77133a5a2798ee3feb18e51b0a299d2f440961e5bb7737dbb02e57289 \ + --hash=sha256:b95733c2360c4a8656ee93c7af78e84c0bd617da04a236d7a456c8faa34e7a2d \ + --hash=sha256:b96fdaa4611e05c7231937930567d3c16782be9dbcf03eb9f60d83e57dd2f129 \ + --hash=sha256:be7e316c2accd5a31dbcc230de19e2a846a325f8967fdea72704d00e38e6af06 \ + --hash=sha256:bed9b04900204721a24bcefc652ca267b01c1e8ad8bc8c0cff81558a45a3aadc \ + --hash=sha256:c16f6d4eea98080f6659a8a7fc559d4a0a337ee66960659265cad2c8a40f7c0f \ + --hash=sha256:c2c476aa3fc2b9899c3f7b20963fac4f952e7edb74a31fc92f7745389a2e3618 \ + --hash=sha256:c6961f05e58d919153ba311b397b7b904b907132b7b8344dde47865d4bb5ec89 \ + --hash=sha256:c8bbd2472abf8c33480ad2314b1f8fac45d592aba6cc093e8839a7b2045660e6 \ + --hash=sha256:c92b5a82d28491e3f14f037e1aae99a27a5e6e0bb161e65f52c0445a3fa7c940 \ + --hash=sha256:d61214525eaf88e0d0edf3d1ad5b5889863c6f88e588c6cdc6aa4ee5d1f10a4a \ + --hash=sha256:d6ebfe9283209220ed9de80a3e9442aab8fc2be5a9bbf8491b99e02ca9349a89 \ + --hash=sha256:d731a4f22ed6ffa4cb551b4d2b0c24ff940c27a88edaf8e3490a5ee3a05aef71 \ + --hash=sha256:d7c532cc9f0a9e6017f8d3c37f478a3e3a5dffa955ebba556274e5e916c058f7 \ + --hash=sha256:d87c285ff04e26083c4b03546e7b74df7ba4f1f32f1dcb92e9ac13c2dbb4c379 \ + --hash=sha256:db2eea83c43f84e4e41dbbb4c1de371a53166e55f900a6b130c3ef51c6345c1a \ + --hash=sha256:e0eb6d155d02c7525b7ec09856cda5e611fc6eb9ab40d140e1f35f27ac7d5eae \ + --hash=sha256:e25fde03c480061b8234d8ee4863eb5f40a9be4fb258ce105b364de38fc6bcf9 \ + --hash=sha256:e2ea096db28d5eb64d381af0e93464621ace38a7003a364b6b5ffb7dd713aabe \ + --hash=sha256:e50bcbd5b65dac21b82319fcf18486e6ac439947e9305034b00704eb7405f553 \ + --hash=sha256:e52e50ea0a72ea48d1291cf8b8aaedcc99072d9dc5baba6b820486dcf4c67da8 \ + --hash=sha256:e64a3a1fd9a308ab9b815a2ad7a65b679730629dbf85f8fc3f7f970d634ee5df \ + --hash=sha256:e761f2d2f8dbc80384af3d547b522a80e67db3e319c7b02e7fd97aded0a8a678 \ + --hash=sha256:e7ca0562606d7bad2736b2c18f61295d61f50cd3f4bfc51753df13614dbcce1b \ + --hash=sha256:ea56817176834edf143df1109ae8fdaa087be82fdad3492648de0baa8ae82bf2 \ + --hash=sha256:ec5028d26011a53c76bd91bb6198b30b438c6e0f7adb45f2ad84fe2655b6a104 \ + --hash=sha256:ee44215e7d13e112a8fc74e12ed1a1f41cab2bc07b11cc703f2398cd114b261c \ + --hash=sha256:f2c7b7fead096dbf1dcc455b7f59facb05de3f5bfb04f60a69f98cdfe6049e5f \ + --hash=sha256:f460e1eb8e75a17c3918c8e35ba57625721eef2439ef0bcf05304ac278a65e1d \ + --hash=sha256:f4b8f8644602803add6848c81b7d214cfd397b1ebab2130dc8530570d888155c \ + --hash=sha256:f73318741b141223a4674ba96992aa2291b1b3f7a5e85cb3c2c964f86171eb45 \ + --hash=sha256:f8255c380a79f6752d0b920e69a5d656d863675d9c433eeb5548518ee2c8d9da \ + --hash=sha256:fe089d9f5a4a3dea0108a8ae34bced114d0c4cca417bada1c5e8f42d98af9050 \ + --hash=sha256:fe6eafac3bc3c957ab6597a0c0654a0a308868458d00d218743e5b5fae51951c # via deprecated # WARNING: The following packages were not pinned, but pip requires them to be From 7b50c66cced64988d2071c97588b0d6ade7fa716 Mon Sep 17 00:00:00 2001 From: William O'Mullane Date: Thu, 30 Oct 2025 18:37:15 -0300 Subject: [PATCH 2/3] Fix for band is None, ConsumerRecord mistakes --- src/obsloctap/consumekafka.py | 14 +++++--------- src/obsloctap/db.py | 11 +++++++++-- tests/DbTest.py | 5 ++++- tests/PredictedScheduleTest.py | 10 ++++++++-- tests/message_mt.pkl | Bin 0 -> 61320 bytes tests/testutils.py | 7 ++++--- 6 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 tests/message_mt.pkl diff --git a/src/obsloctap/consumekafka.py b/src/obsloctap/consumekafka.py index e77b8dd..bbea90b 100644 --- a/src/obsloctap/consumekafka.py +++ b/src/obsloctap/consumekafka.py @@ -100,8 +100,8 @@ def convert_predicted_kafka(msg: dict) -> list[Obsplan]: plan.append(p) if len(plan) < max: log.info( - "Predicted message says {max} targets but only " - "{len(plan)} have t_planning>0" + f"Predicted message says {max} targets but only " + f"{len(plan)} have t_planning>0" ) return plan @@ -127,7 +127,6 @@ def unpack_value(value: Any, schema: dict) -> dict: def unpack_message(msg: ConsumerRecord) -> dict: - log.info(f"Unpack kafka message {msg.timestamp}") value = msg.value # bytes from Kafka message magic = value[0] assert magic == 0, "Not Confluent Avro wire format" @@ -137,14 +136,11 @@ def unpack_message(msg: ConsumerRecord) -> dict: async def process_message(msg: ConsumerRecord) -> None: - log.info( - f"Processing kafka - {msg['topic']} {msg['timestamp']} " - f"index: {[msg['salIndex']]}" - ) - if msg["salIndex"] != config.salIndex: + log.info(f"Processing kafka - {msg.key} {msg.timestamp} ") + record = unpack_message(msg) + if record["salIndex"] != config.salIndex: log.info(f"Skipping message - salIndex not {config.salIndex}") return - record = unpack_message(msg) # log.debug(record) plan = convert_predicted_kafka(record) log.info( diff --git a/src/obsloctap/db.py b/src/obsloctap/db.py index 8f82811..cd9cc19 100644 --- a/src/obsloctap/db.py +++ b/src/obsloctap/db.py @@ -230,6 +230,11 @@ async def update_entries( async def insert_exposure( self, exp: Exposure, session: AsyncSession ) -> None: + if not exp.band: + log.warning( + f"{exp.exposure_id} has no band - " + f"will insert 'other:pinhole'" # noqa: E231 em_max + ) """put in an obsplan line based on an exposure this is when consdb has an observation but it does not match any planned item""" @@ -248,8 +253,10 @@ async def insert_exposure( f"{exp.obs_end_mjd}, " # t_max f"{exp.obs_end_mjd - exp.obs_start_mjd}, " # t_exptime f"15, " # t_resolution - f"'{spectral_ranges[exp.band][0]}', " # em_min - f"'{spectral_ranges[exp.band][1]}', " # em_max + f"'{spectral_ranges[ + exp.band or 'other:pinhole'][0]}', " # noqa: E231 em_min + f"'{spectral_ranges[ + exp.band or 'other:pinhole'][1]}', " # noqa: E231 em_max f"0, " # em_res_power f"'phot.flux.density', " # o_ucd f"'', " # pol_states diff --git a/tests/DbTest.py b/tests/DbTest.py index 2b76e8c..70e618a 100644 --- a/tests/DbTest.py +++ b/tests/DbTest.py @@ -201,5 +201,8 @@ async def test_insert_exposure(self) -> None: exp = exps[0] await dbhelp.insert_exposure(exp, dbhelp.get_session()) + exp = exps[1] + exp.band = None # test this + await dbhelp.insert_exposure(exp, dbhelp.get_session()) plans2 = len(await dbhelp.get_schedule(time=0)) - assert plans2 == plans + 1 + assert plans2 == plans + 2 diff --git a/tests/PredictedScheduleTest.py b/tests/PredictedScheduleTest.py index 4d70921..133e2b2 100644 --- a/tests/PredictedScheduleTest.py +++ b/tests/PredictedScheduleTest.py @@ -75,10 +75,16 @@ def test_convert(self) -> None: def test_msg(self) -> None: # schema = get_schema() - with open("tests/predicted_message.pkl", "rb") as f: + with open("tests/message_mt.pkl", "rb") as f: msg = pickle.load(f) assert msg - # plan = unpack_message(msg, schema) + with open("tests/schema2191.pkl", "rb") as s: + schema = pickle.load(s) + print(f"testing kafka - {msg.timestamp} " f"index: {msg.key}") + rec = unpack_value(msg.value, schema) + self.assertEqual(rec["salIndex"], config.salIndex) + plan = convert_predicted_kafka(rec) + self.assertEqual(19, len(plan), " Seem to not get all lines") @pytest.mark.asyncio async def test_exp_updates(self) -> None: diff --git a/tests/message_mt.pkl b/tests/message_mt.pkl new file mode 100644 index 0000000000000000000000000000000000000000..e9dff1e5cd55ba8919e1b89ddf8f0c73d3654453 GIT binary patch literal 61320 zcmeI&c{J4f|G;sj5JiPHlxVS+R#AD`#*7)vMx>M&5o5+IMQC3oEhgQxYm=f|ZYpi> zlvbB4b&FQrl%;69R9F4X?Y`>w&+nYyKlgj?Ip25A>A`0(Gp~7lp64^?Ski4vN{hx{ z|I&JgMN4ABB4ffF3c}xiq+v2ev?5v(r($cQ zX-Og@ zL)UX>&bbYO8n-#%lUC!p8vb$iwp=Lx84ed{qswkL=StLIu)d4kvGHQs66ynylZeI8@H2RLrY zy)bBu7x)Wq-JhG}0rP@->Sq^wz};uY9R_{f;imv@a^C>>Zpb22N!v*`nCfa__O`_J zyPN*J-1t1e4bY->*Dds3y2IOD5edOf@ZH+M#Y>a6xC1(-sNTRw34rdrmG3rgk~^Sg zZ@_eUsT-hcPA(ni+3W%63Hx7$#xdLg9aq?^@Ol;idJg)0QlxtTTAxU&G|>W%DIu$BWTqx;^4*#o7NCayQ7xf= zdIEZ9c}kn_Kmb%@+N3#pLp=daDH`#H&tw707uQwWZ}SDzs#kYg^Gq(FH$1C${GPxA zv~URbWKC~AptGdEtsH%m52#&~_LLhAJU}hu^*)T``vDrz_t}vXV_AS+v()sMSmq9> z{6s>XZVwiqevap(TY3I~I@n!|N{QzJT3WokNM{ECD)fr`$?-fBP?KJlZlA4m0<^^P z!)ApI6VS{<*@^Wpd4L+QPM=-0HUQ9_EY7M$lV<|jWgo*m{Ngk~>%JO9blegGI59t3FeU5A@% zSTg`^+CD1d!l__D^YSrx)Lq6CSHY{74Er4G)nMQSU4EXM%*^|uOPX_|JW8x7db4(DR-Ix#O z_YzJ6RAt^$@ymulP;QxN^2e(Hc*GEeW=sx%diwq5=>Hb4L*j@>6&iP3I7HhNK#8?SHRdD5ko3!)xE*66_5AwivZSQSd zCJ(xb4CT!0T$u4be3^5uKlJqdbfmJ6KTOehIM}Q6{H%%VzHX-l7rc(?8Gc>k2jR{S z3)krTLB$Z(z(^hk#GA73q<&?CS;pdPS1z*QK#9F?$WR}cHgx-YVEVxI&&^|0DL$~P zC7hpqoC7ajIX|3!!3W5(fcEOazVK6@%ya5)S?Y65jV%12j-PhW>JQⅈ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 N5h9sfWv!g!@IPEH-BADl literal 0 HcmV?d00001 diff --git a/tests/testutils.py b/tests/testutils.py index 482e269..7ad7c1d 100644 --- a/tests/testutils.py +++ b/tests/testutils.py @@ -29,18 +29,19 @@ async def dump_msg() -> None: schema = pickle.load(s) try: schema = get_schema(schema_id) - except Exception: - print(f"failed to get schems {Exception}") + except Exception as e: + print(f"failed to get schemas {e}") msg_dict = unpack_value(value, schema) if msg_dict["salIndex"] == 1: with open(f"schema{schema_id}.pkl", "wb") as f: pickle.dump(schema, f) with open(msg_fn, "wb") as f: + print(f"Dumping message {msg_fn}") pickle.dump(msg, f) break else: - print(f"Ignoring message {msg_dict['salIndex']}") + print(f"Ignoring message salIndex {msg_dict['salIndex']}") await consumer.stop() From 76c009d2023cddb87a7240897098f5452210033e Mon Sep 17 00:00:00 2001 From: William O'Mullane Date: Mon, 3 Nov 2025 14:25:40 -0300 Subject: [PATCH 3/3] Value Erro no Matching Sim --- src/obsloctap/schedule24h.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/obsloctap/schedule24h.py b/src/obsloctap/schedule24h.py index d9eda6f..00b4365 100644 --- a/src/obsloctap/schedule24h.py +++ b/src/obsloctap/schedule24h.py @@ -48,10 +48,11 @@ def __init__(self) -> None: def get_schedule24(self) -> DataFrame: """ - Get he 24 schedule form the rubin_sim api call + Get the 24 schedule form the rubin_sim api call Need these: os.environ["LSST_DISABLE_BUCKET_VALIDATION"] = "1" os.environ["S3_ENDPOINT_URL"] = "https://s3dfrgw.slac.stanford.edu/" + AWS credintials Returns DataFrame of schedule entries ------- """ @@ -62,6 +63,10 @@ def get_schedule24(self) -> DataFrame: except TypeError: log.info("Dropping to 1 night for sim") visits = sim_archive.fetch_obsloctap_visits(nights=1) + except ValueError as ve: + log.warning(f"Error encountered while fetching visits {ve}") + return [] + if type(visits) is not DataFrame: visits = DataFrame(visits) log.info(f"Got {visits.size} for 24 hour schedule")