Move check for AZURE_PUBLIC_NETWORK_ACCESS (#2209)

* Update prepdocs.sh to set the AZURE_USE_AUTHENTICATION correctly based on the environment equivalent

* resolve conversation

* Move check into prepdocs.py

---------

Co-authored-by: Richard Grey <[email protected]>

Author: pamelafox

app/backend/app.py

@@ -102,7 +102,6 @@
 
 @bp.route("/")
 async def index():
-    # TODO: use msal loginRedirect on a blankish page
     return await bp.send_static_file("index.html")
 
 

app/backend/prepdocs.py

@@ -241,8 +241,7 @@ async def main(strategy: Strategy, setup_index: bool = True):
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(
-        description="Prepare documents by extracting content from PDFs, splitting content into sections, uploading to blob storage, and indexing in a search index.",
-        epilog="Example: prepdocs.py '.\\data\*' -v",
+        description="Prepare documents by extracting content from PDFs, splitting content into sections, uploading to blob storage, and indexing in a search index."
     )
     parser.add_argument("files", nargs="?", help="Files to be processed")
 
@@ -302,6 +301,10 @@ async def main(strategy: Strategy, setup_index: bool = True):
 
     load_azd_env()
 
+    if os.getenv("AZURE_PUBLIC_NETWORK_ACCESS") == "Disabled":
+        logger.error("AZURE_PUBLIC_NETWORK_ACCESS is set to Disabled. Exiting.")
+        exit(0)
+
     use_int_vectorization = os.getenv("USE_FEATURE_INT_VECTORIZATION", "").lower() == "true"
     use_gptvision = os.getenv("USE_GPT4V", "").lower() == "true"
     use_acls = os.getenv("AZURE_ADLS_GEN2_STORAGE_ACCOUNT") is not None

scripts/prepdocs.sh

@@ -4,14 +4,6 @@
 
 echo 'Running "prepdocs.py"'
 
-AZURE_USE_AUTHENTICATION=$(azd env get-value AZURE_PUBLIC_NETWORK_ACCESS)
-AZURE_PUBLIC_NETWORK_ACCESS=$(azd env get-value AZURE_PUBLIC_NETWORK_ACCESS)
-
-if [ -n "$AZURE_USE_AUTHENTICATION" ] && [ "$AZURE_PUBLIC_NETWORK_ACCESS" = "Disabled" ]; then
-  echo "AZURE_PUBLIC_NETWORK_ACCESS is set to Disabled. Exiting."
-  exit 0
-fi
-
 additionalArgs=""
 if [ $# -gt 0 ]; then
   additionalArgs="$@"