update logic for detect device name

Author: parthlambdatest

selenium/lambdatest_selenium_driver/full_page_screenshot_util.py

@@ -50,9 +50,6 @@ def __init__(self, driver: WebDriver, save_directory_name: str,
         self.prev_page_source = ""
         self.default_page_count = DEFAULT_PAGE_COUNT
 
-        logger.info(f"FullPageScreenshotUtil initialized for testType: {self.test_type}, "
-                   f"platform: {self.platform}, deviceName: {self.device_name}")
-        
         self._create_directory_if_needed()
 
     def _create_directory_if_needed(self):
@@ -377,6 +374,10 @@ def _detect_device_name(self) -> str:
                 caps = self.driver.capabilities
                 device_keys = ["deviceName", "device", "deviceModel", "deviceType"]
 
+                for key in device_keys:
+                    desired = caps.get("desired", {})
+                    if key in desired and desired[key]:
+                        return str(desired[key])
                 for key in device_keys:
                     if key in caps and caps[key]:
                         return str(caps[key])

selenium/lambdatest_selenium_driver/smartui_app_snapshot.py

@@ -171,8 +171,6 @@ def _validate_mandatory_params(self, driver: WebDriver, screenshot_name: str, de
             raise ValueError("An instance of the selenium driver object is required.")
         if not screenshot_name or screenshot_name.strip() == "":
             raise ValueError("The `snapshotName` argument is required.")
-        if not device_name or device_name.strip() == "":
-            raise ValueError("Device name is a mandatory parameter.")
 
     def _create_upload_request(self, driver: WebDriver, screenshot_name: str, 
                                config: SnapshotConfig) -> UploadSnapshotRequest:
@@ -182,7 +180,6 @@ def _create_upload_request(self, driver: WebDriver, screenshot_name: str,
         viewport_string = f"{rect['width']}x{rect['height']}"
 
         request = self._initialize_upload_request(screenshot_name, viewport_string, config)
-        self._configure_device_and_platform(request, config.device_name, config.platform)
         request.screenshot_hash = str(uuid.uuid4())
 
         return request
@@ -203,10 +200,10 @@ def _initialize_upload_request(self, screenshot_name: str, viewport: str, config
         return request
 
     def _configure_device_and_platform(self, request: UploadSnapshotRequest, 
-                                      device_name: str, platform: str):
+                                      device_name: str):
         """Configure device and platform information."""
         browser_name = self._determine_default_browser(device_name)
-        platform_name = self._determine_platform_name(platform, browser_name)
+        platform_name = self._determine_platform_name(browser_name)
 
         request.os = platform_name
         request.device_name = f"{device_name} {platform_name}"
@@ -216,9 +213,9 @@ def _determine_default_browser(self, device_name: str) -> str:
         """Determine default browser based on device name."""
         return PLATFORM_IOS if device_name.lower().startswith("i") else PLATFORM_ANDROID
 
-    def _determine_platform_name(self, platform: str, default_browser: str) -> str:
+    def _determine_platform_name(self, default_browser: str) -> str:
         """Determine platform name."""
-        return platform if platform and platform.strip() else default_browser
+        return default_browser
 
     def _determine_actual_browser(self, platform_name: str) -> str:
         """Determine actual browser name."""
@@ -272,6 +269,7 @@ def _handle_screenshot_capture(self, driver: WebDriver, screenshot_name: str,
                     driver, temp_dir, config.test_type, config.precise_scroll
             )
             upload_request.device_name = full_page_util.device_name
+            self._configure_device_and_platform(upload_request, full_page_util.device_name)
             if config.full_page:
                 # Full-page screenshot
                 result = full_page_util.capture_full_page_screenshot(page_count)