Fix merge conflict in config.py

config.py

@@ -89,7 +89,6 @@ class JunctionConfig(BaseConfig):
     radius: int = 5
     angle_threshold_lb: float = 15.0
     angle_threshold_ub: float = 75.0
-<<<<<<< HEAD
     expansion_factor: float = 1.1
     mask_json_paths: List[str] = field(default_factory=list)  # Now a list
 
@@ -105,12 +104,3 @@ class JunctionConfig(BaseConfig):
             'thickness': 2,
             'font_scale': 0.6
         }
-=======
-
-# @dataclass
-# class JunctionConfig:
-#     radius: int = 5
-#     angle_threshold: float = 25.0
-#     colinear_threshold: float = 5.0
-#     connection_threshold: float = 5.0
->>>>>>> temp/test-integration

gradioChatApp.py

@@ -527,36 +527,25 @@ custom_css = """
 
 def check_environment():
     """Check required environment variables and model files."""
-    required_vars = {
-        'OPENAI_API_KEY': 'OpenAI API key is required for chat functionality',
-        'STORAGE_TYPE': 'Storage type must be specified (local or azure)',
-        'USE_TORCH': 'Torch configuration must be specified'
-    }
-    
-    missing_vars = []
-    for var, message in required_vars.items():
-        if not os.getenv(var):
-            missing_vars.append(f"{var}: {message}")
-    
-    if missing_vars:
-        logger.error("Missing required environment variables:")
-        for msg in missing_vars:
-            logger.error(f"  - {msg}")
-        return False
+    logger.info("Checking environment configuration...")
     
-    # Check for DeepLSD
     try:
-        import deeplsd
-        logger.info("DeepLSD package found")
-    except ImportError:
-        logger.error("DeepLSD package not found. Please install with: pip install git+https://github.com/cvg/DeepLSD.git")
+        from storage import StorageFactory
+        storage = StorageFactory.get_storage()
+        logger.info(f"Storage initialized successfully: {storage.__class__.__name__}")
+    except Exception as e:
+        logger.error(f"Storage initialization error: {str(e)}")
+        logger.error(traceback.format_exc())
         return False
     
-    # Check for model files
-    model_path = "models/deeplsd_md.tar"
-    if not os.path.exists(model_path):
-        logger.error(f"Required model file not found: {model_path}")
-        return False
+    # Log environment variables (excluding sensitive data)
+    env_vars = {
+        'STORAGE_TYPE': os.getenv('STORAGE_TYPE'),
+        'USE_TORCH': os.getenv('USE_TORCH'),
+        'LANGCHAIN_TRACING_V2': os.getenv('LANGCHAIN_TRACING_V2'),
+        'LANGCHAIN_PROJECT': os.getenv('LANGCHAIN_PROJECT')
+    }
+    logger.info(f"Environment variables: {env_vars}")
     
     return True
 
@@ -720,12 +709,15 @@ if __name__ == "__main__":
 else:
     # For Spaces deployment
     try:
+        logger.info("Initializing Spaces deployment...")
         demo = create_ui()
         app = demo.app
+        logger.info("Application initialized successfully")
     except Exception as e:
         logger.error(f"Failed to initialize app: {str(e)}")
-        # Create minimal error app
+        logger.error(traceback.format_exc())
         with gr.Blocks() as error_demo:
             gr.Markdown("# ⚠️ Deployment Error")
-            gr.Markdown("Failed to initialize the application.")
+            gr.Markdown(f"Error: {str(e)}")
+            gr.Markdown("Please check the logs for details.")
         app = error_demo.app