orders

app/services/tcgplayer.py

@@ -21,6 +21,7 @@ import pandas as pd
 from sqlalchemy.exc import SQLAlchemyError
 from app.schemas.file import CreateFileRequest
 import os
+from app.services.util._docker import DockerUtil
 
 
 logger = logging.getLogger(__name__)
@@ -53,6 +54,7 @@ class TCGPlayerService:
         self.previous_request_time = None
         self.df_util = DataframeUtil()
         self.file_service = file_service
+        self.docker_util = DockerUtil()
     
     def _insert_groups(self, groups):
         for group in groups:
@@ -118,47 +120,6 @@ class TCGPlayerService:
         except Exception as e:
             logger.error(f"Failed to get browser cookies: {str(e)}")
             return None
-
-    def is_in_docker(self) -> bool:
-        """Check if we're running inside a Docker container using multiple methods"""
-        # Method 1: Check cgroup
-        try:
-            with open('/proc/1/cgroup', 'r') as f:
-                content = f.read().lower()
-                if any(container_id in content for container_id in ['docker', 'containerd', 'kubepods']):
-                    logger.debug("Docker detected via cgroup")
-                    return True
-        except Exception as e:
-            logger.debug(f"Could not read cgroup file: {e}")
-
-        # Method 2: Check /.dockerenv file
-        if os.path.exists('/.dockerenv'):
-            logger.debug("Docker detected via /.dockerenv file")
-            return True
-
-        # Method 3: Check environment variables
-        docker_env = any(os.environ.get(var, False) for var in [
-            'DOCKER_CONTAINER',
-            'IN_DOCKER',
-            'KUBERNETES_SERVICE_HOST',  # For k8s
-            'DOCKER_HOST'
-        ])
-        if docker_env:
-            logger.debug("Docker detected via environment variables")
-            return True
-
-        # Method 4: Check container runtime
-        try:
-            with open('/proc/self/mountinfo', 'r') as f:
-                content = f.read().lower()
-                if any(rt in content for rt in ['docker', 'containerd', 'kubernetes']):
-                    logger.debug("Docker detected via mountinfo")
-                    return True
-        except Exception as e:
-            logger.debug(f"Could not read mountinfo: {e}")
-
-        logger.debug("No Docker environment detected")
-        return False
             
     def _send_request(self, url: str, method: str, data=None, except_302=False) -> requests.Response:
         """Send a request with the specified cookies"""
@@ -173,7 +134,7 @@ class TCGPlayerService:
         
         # Move cookie initialization outside and make it more explicit
         if not self.cookies:
-            if self.is_in_docker():
+            if self.docker_util.is_in_docker():
                 logger.debug("Running in Docker - using cookies from file")
                 self.cookies = self.get_cookies_from_file()
             else: