From 53c9726263d68887b9cccb1eaf7f7cc3f92f259b Mon Sep 17 00:00:00 2001
From: kompotkot <sumarokovsergei@yandex.ru>
Date: Thu, 27 Jun 2024 11:28:29 +0000
Subject: [PATCH] Raise var value error fix for mdb v3

---
 crawlers/mooncrawl/setup.py                |  2 +-
 moonstreamdb-v3/moonstreamdbv3/db.py       | 35 ++++++++++------------
 moonstreamdb-v3/moonstreamdbv3/version.txt |  2 +-
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/crawlers/mooncrawl/setup.py b/crawlers/mooncrawl/setup.py
index 19cf9ad5..90f35ee0 100644
--- a/crawlers/mooncrawl/setup.py
+++ b/crawlers/mooncrawl/setup.py
@@ -38,7 +38,7 @@ setup(
         "chardet",
         "fastapi",
         "moonstreamdb>=0.4.4",
-        "moonstreamdb-v3>=0.0.10",
+        "moonstreamdb-v3>=0.0.11",
         "moonstream-types>=0.0.3",
         "moonstream>=0.1.1",
         "moonworm[moonstream]>=0.9.2",
diff --git a/moonstreamdb-v3/moonstreamdbv3/db.py b/moonstreamdb-v3/moonstreamdbv3/db.py
index 92563115..0860b42b 100644
--- a/moonstreamdb-v3/moonstreamdbv3/db.py
+++ b/moonstreamdb-v3/moonstreamdbv3/db.py
@@ -13,30 +13,25 @@ from sqlalchemy.orm import Session, sessionmaker
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-try:
-    MOONSTREAM_DB_V3_URI = os.environ.get("MOONSTREAM_DB_V3_URI")
-    if MOONSTREAM_DB_V3_URI is None:
-        raise Warning("MOONSTREAM_DB_V3_URI environment variable must be set")
+MOONSTREAM_DB_V3_URI = os.environ.get("MOONSTREAM_DB_V3_URI")
+if MOONSTREAM_DB_V3_URI is None:
+    logger.warning("MOONSTREAM_DB_V3_URI environment variable must be set")
 
-    MOONSTREAM_DB_V3_URI_READ_ONLY = os.environ.get("MOONSTREAM_DB_V3_URI_READ_ONLY")
-    if MOONSTREAM_DB_V3_URI_READ_ONLY is None:
-        raise Warning("MOONSTREAM_DB_V3_URI_READ_ONLY environment variable must be set")
+MOONSTREAM_DB_V3_URI_READ_ONLY = os.environ.get("MOONSTREAM_DB_V3_URI_READ_ONLY")
+if MOONSTREAM_DB_V3_URI_READ_ONLY is None:
+    logger.warning("MOONSTREAM_DB_V3_URI_READ_ONLY environment variable must be set")
 
-    MOONSTREAM_DB_V3_INDEXES_URI = os.environ.get("MOONSTREAM_DB_V3_INDEXES_URI")
-    if MOONSTREAM_DB_V3_INDEXES_URI is None:
-        raise Warning("MOONSTREAM_DB_V3_INDEXES_URI environment variable must be set")
+MOONSTREAM_DB_V3_INDEXES_URI = os.environ.get("MOONSTREAM_DB_V3_INDEXES_URI")
+if MOONSTREAM_DB_V3_INDEXES_URI is None:
+    raise ValueError("MOONSTREAM_DB_V3_INDEXES_URI environment variable must be set")
 
-    MOONSTREAM_DB_V3_INDEXES_URI_READ_ONLY = os.environ.get(
-        "MOONSTREAM_DB_V3_INDEXES_URI_READ_ONLY"
+MOONSTREAM_DB_V3_INDEXES_URI_READ_ONLY = os.environ.get(
+    "MOONSTREAM_DB_V3_INDEXES_URI_READ_ONLY"
+)
+if MOONSTREAM_DB_V3_INDEXES_URI_READ_ONLY is None:
+    raise ValueError(
+        "MOONSTREAM_DB_V3_INDEXES_URI_READ_ONLY environment variable must be set"
     )
-    if MOONSTREAM_DB_V3_INDEXES_URI_READ_ONLY is None:
-        raise Warning(
-            "MOONSTREAM_DB_V3_INDEXES_URI_READ_ONLY environment variable must be set"
-        )
-except ValueError as e:
-    raise ValueError(e)
-except Warning:
-    logger.warning("Database variables not set")
 
 MOONSTREAM_POOL_SIZE_RAW = os.environ.get("MOONSTREAM_POOL_SIZE")
 MOONSTREAM_POOL_SIZE = 1
diff --git a/moonstreamdb-v3/moonstreamdbv3/version.txt b/moonstreamdb-v3/moonstreamdbv3/version.txt
index 7c1886bb..2cfabea2 100644
--- a/moonstreamdb-v3/moonstreamdbv3/version.txt
+++ b/moonstreamdb-v3/moonstreamdbv3/version.txt
@@ -1 +1 @@
-0.0.10
+0.0.11