tiktokautouploader 2.86__py2.py3-none-any.whl → 2.95__py2.py3-none-any.whl

tiktokautouploader/function.py

@@ -9,8 +9,7 @@ from PIL import Image
 import sys
 import os
 import warnings
-warnings.filterwarnings("ignore")
-
+warnings.simplefilter("ignore")
 
 def login_warning():
     print("NO COOKIES FILE FOUND, PLEASE LOG-IN WHEN PROMPTED")
@@ -19,9 +18,27 @@ def save_cookies(cookies):
     with open('TK_cookies.json', 'w') as file:
         json.dump(cookies, file, indent=4)
 
+def check_expiry():
+    with open('TK_cookies.json', 'r') as file:
+        cookies = json.load(file)
+
+    current_time = int(time.time())
+    cookies_expire = []
+    expired = False
+    for cookie in cookies:
+        if cookie['name'] in ['sessionid', 'sid_tt', 'sessionid_ss', 'passport_auth_status']:
+            expiry = cookie.get('expires')
+            cookies_expire.append(expiry < current_time)
+
+    if all(cookies_expire):
+        expired = True
+
+    return expired
+
 def run_javascript():
     js_file_path = pkg_resources.resource_filename(__name__, 'Js_assets/login.js')
     result = subprocess.run(['node', js_file_path], capture_output=True, text=True)
+    return result
 
 def install_js_dependencies():
     js_dir = pkg_resources.resource_filename(__name__, 'Js_assets')
@@ -30,6 +47,7 @@ def install_js_dependencies():
     if not os.path.exists(node_modules_path):
         print("JavaScript dependencies not found. Installing...")
         subprocess.run(['npm', 'install', 'playwright', 'playwright-extra', 'puppeteer-extra-plugin-stealth', '--silent'], cwd=js_dir, check=True)
+        subprocess.run(['npx', 'playwright', 'install', 'chromium'], cwd=js_dir, check=True)
     else:
         time.sleep(0.1)
 
@@ -70,11 +88,24 @@ def understood_Qs(question):
         'has strings': 'guitar',
         'oval and inflatable': 'football',
         'strumming': 'guitar',
-        'bounces on courts': 'basketball',
+        'bounces': 'basketball',
         'musical instrument': 'guitar',
         'laces': 'football',
         'bands': 'guitar',
-        'leather': 'football'
+        'leather': 'football',
+        'leaves':'tree',
+        'pages': 'book',
+        'throwing': 'football',
+        'tossed in a spiral': 'football',
+        'spiky crown': 'pineapple',
+        'pigskin': 'football',
+        'photography': 'camera',
+        'lens': 'camera',
+        'grow': 'tree',
+        'captures images': 'camera',
+        'keeps doctors': 'apple',
+        'crown': 'pineapple',
+        'driven': 'car',
         }
     
     for key in understood_terms.keys():
@@ -100,8 +131,7 @@ def download_image(image_url):
 
 def run_inference_on_image_tougher(image_path, object):
 
-    found_proper = False
-    model = inference.get_model("captcha-2-6ehbe/1")
+    model = inference.get_model("captcha-2-6ehbe/2")
     results = model.infer(image=image_path)
 
     class_names = []
@@ -121,12 +151,9 @@ def run_inference_on_image_tougher(image_path, object):
         if classes == class_to_click:
             bounding_box.append(bounding_boxes[i])
     
-    if len(bounding_box) == 2:
-        found_proper = True
 
-    found_proper = True
 
-    return bounding_box, found_proper
+    return bounding_box
 
 def run_inference_on_image(image_path):
 
@@ -204,14 +231,20 @@ def upload_tiktok(video, description, hashtags=None, sound_name=None, sound_aud_
 
     retries = 0
     cookie_read = False
-    install_js_dependencies()
+    oldQ = 'N.A'
 
     if os.path.exists('TK_cookies.json'):
         cookies, cookie_read = read_cookies(cookies_path='TK_cookies.json')
+        expired = check_expiry()
+        if expired == True:
+            os.remove('TK_cookies.json')
+            print("COOKIES EXPIRED, PLEASE LOG-IN AGAIN")
+            cookie_read = False
     
     if cookie_read == False:
+        install_js_dependencies()
         login_warning()
-        run_javascript()
+        result = run_javascript()
 
         cookies, cookie_read = read_cookies("TK_cookies.json")
         if cookie_read == False:
@@ -220,13 +253,12 @@ def upload_tiktok(video, description, hashtags=None, sound_name=None, sound_aud_
 
     with sync_playwright() as p:
         
-        browser = p.firefox.launch(headless=True)
+        browser = p.webkit.launch(headless=False)
 
         context = browser.new_context()
         context.add_cookies(cookies)
         page = context.new_page()
         url = 'https://www.tiktok.com/tiktokstudio/upload?from=upload&lang=en'
-        url2 = 'https://www.tiktok.com/tiktokstudio/content?tab=draft'
 
         while retries < 2:
             try:
@@ -258,24 +290,28 @@ def upload_tiktok(video, description, hashtags=None, sound_name=None, sound_aud_
                     print("CAPTCHA DETECTED, Attempting to solve")
                 solved = False
                 attempts = 0
+                question = page.locator('div.VerifyBar___StyledDiv-sc-12zaxoy-0.hRJhHT').text_content()
                 while solved == False:
                     attempts += 1
-                    question = page.locator('div.VerifyBar___StyledDiv-sc-12zaxoy-0.hRJhHT').text_content()
+                    start_time = time.time()
+                    while question == oldQ:
+                        question = page.locator('div.VerifyBar___StyledDiv-sc-12zaxoy-0.hRJhHT').text_content()
+                        if time.time() - start_time > 2:
+                            break
                     if 'Select 2 objects that are the same' in question:
                         found = False
                         while found == False:
                             page.click('span.secsdk_captcha_refresh--text')
-                            time.sleep(0.5)
                             image = get_image_src(page)
                             img_path = download_image(image)
                             b_box, found = run_inference_on_image(image_path=img_path)
                     
                         with Image.open(img_path) as img:
                             image_size = img.size
-                    
-                        image = page.locator('#captcha-verify-image')
-                        image.wait_for()
-                        box = image.bounding_box()
+                        
+                        imageweb = page.locator('#captcha-verify-image')
+                        imageweb.wait_for()
+                        box = imageweb.bounding_box()
                         image_x = box['x']
                         image_y = box['y']
                         image_height_web = box['height']
@@ -287,36 +323,39 @@ def upload_tiktok(video, description, hashtags=None, sound_name=None, sound_aud_
                         time.sleep(0.5)
                         if attempts > 5:
                             sys.exit("FAILED TO SOLVE CAPTCHA")
-                        try:
-                            page.wait_for_selector('.upload-text-container', timeout=5000)
-                            os.remove('captcha_image.jpg')
-                            if suppressprint == False:
-                                print("Captcha Solved")
-                            solved = True
-                        except:
-                            continue
+                        while showedup == False:
+                            if page.locator("div.captcha_verify_message.captcha_verify_message-pass").is_visible():
+                                solved = True
+                                showedup = True
+                            if page.locator("div.captcha_verify_message.captcha_verify_message-fail").is_visible():
+                                showedup = True
+                                oldQ = question
+                                page.click('span.secsdk_captcha_refresh--text')
                     else:
-                        found_prop = False
-                        while found_prop == False:
+                        objectclick = understood_Qs(question)
+                        while objectclick == 'N.A':
+                            oldQ = question
                             page.click('span.secsdk_captcha_refresh--text')
-                            time.sleep(0.5)
-                            question = page.locator('div.VerifyBar___StyledDiv-sc-12zaxoy-0.hRJhHT').text_content()
-                            objectclick = understood_Qs(question)
-                            while objectclick == 'N.A':
-                                page.click('span.secsdk_captcha_refresh--text')
-                                page.wait_for_selector('div.VerifyBar___StyledDiv-sc-12zaxoy-0.hRJhHT')
+                            start_time = time.time()
+                            runs = 0
+                            while question == oldQ:
+                                runs += 1
                                 question = page.locator('div.VerifyBar___StyledDiv-sc-12zaxoy-0.hRJhHT').text_content()
-                                objectclick = understood_Qs(question)
-                            image = get_image_src(page)
-                            img_path = download_image(image)
-                            b_box, found_prop = run_inference_on_image_tougher(image_path=img_path, object=objectclick)
-                        
+                                if runs > 1:
+                                    time.sleep(1)
+                                if time.time() - start_time > 2:
+                                    break
+                            objectclick = understood_Qs(question)
+                        image = get_image_src(page)
+                        img_path = download_image(image)
+                        b_box = run_inference_on_image_tougher(image_path=img_path, object=objectclick)
+                    
                         with Image.open(img_path) as img:
                             image_size = img.size
-                    
-                        image = page.locator('#captcha-verify-image')
-                        image.wait_for()
-                        box = image.bounding_box()
+
+                        imageweb = page.locator('#captcha-verify-image')
+                        imageweb.wait_for()
+                        box = imageweb.bounding_box()
                         image_x = box['x']
                         image_y = box['y']
                         image_height_web = box['height']
@@ -325,20 +364,22 @@ def upload_tiktok(video, description, hashtags=None, sound_name=None, sound_aud_
 
                         webpage_coords = convert_to_webpage_coordinates(b_box, image_x, image_y, image_height_web, image_width_web, image_height_real, image_width_real)
                         
-                        
                         click_on_objects(page, webpage_coords)
-                        time.sleep(0.5)
                         page.click("div.verify-captcha-submit-button")
-                        if attempts > 10:
+                        if attempts > 20:
                             sys.exit("FAILED TO SOLVE CAPTCHA")
-                        try:
-                            page.wait_for_selector('.upload-text-container', timeout=5000)
-                            solved = True
-                            os.remove('captcha_image.jpg')
-                            if suppressprint == False:
-                                print("Captcha Solved")
-                        except:
-                            continue
+                        showedup = False
+                        while showedup == False:
+                            if page.locator("div.captcha_verify_message.captcha_verify_message-pass").is_visible():
+                                solved = True
+                                showedup = True
+                                os.remove('captcha_image.jpg')
+                                if suppressprint == False:
+                                    print("CAPTCHA SOLVED")
+                            if page.locator("div.captcha_verify_message.captcha_verify_message-fail").is_visible():
+                                showedup = True
+                                oldQ = question
+                                page.click('span.secsdk_captcha_refresh--text')
 
         
         try:
@@ -397,7 +438,7 @@ def upload_tiktok(video, description, hashtags=None, sound_name=None, sound_aud_
         time.sleep(0.2)
         if suppressprint == False:
             print("Tik tok done loading file onto servers")
-        
+
         if schedule != None:
             try:
                 hour = schedule[0:2]
@@ -409,7 +450,13 @@ def upload_tiktok(video, description, hashtags=None, sound_name=None, sound_aud_
                 sys.exit("SCHEDULE TIME ERROR: PLEASE MAKE SURE YOUR SCHEDULE TIME IS A STRING THAT FOLLOWS THE 24H FORMAT 'HH:MM', VIDEO SAVED AS DRAFT")
 
             page.locator('div.TUXRadioStandalone.TUXRadioStandalone--medium').nth(1).click()
-            time.sleep(0.2)
+            time.sleep(1)
+            if page.locator('button.TUXButton.TUXButton--default.TUXButton--medium.TUXButton--primary:has-text("Allow")').nth(0).is_visible():
+                page.locator('button.TUXButton.TUXButton--default.TUXButton--medium.TUXButton--primary:has-text("Allow")').nth(0).click()
+                time.sleep(0.2)
+            else:
+                if page.locator('div.TUXTextInputCore-trailingIconWrapper').nth(1).is_visible():
+                    time.sleep(0.2)
             if day != None:
                 page.locator('div.TUXTextInputCore-trailingIconWrapper').nth(1).click()
                 time.sleep(0.2)
@@ -438,7 +485,6 @@ def upload_tiktok(video, description, hashtags=None, sound_name=None, sound_aud_
         if (schedule == None) and (day != None):
             sys.exit("ERROR: CANT SCHEDULE FOR ANOTHER DAY USING 'day' WITHOUT ALSO INCLUDING TIME OF UPLOAD WITH 'schedule'; PLEASE ALSO INCLUDE TIME WITH 'schedule' PARAMETER")
 
-
         if(sound_name == None):
             if copyrightcheck == True:
                 page.locator(".TUXSwitch-input").nth(0).click()

{tiktokautouploader-2.86.dist-info → tiktokautouploader-2.95.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tiktokautouploader
-Version: 2.86
+Version: 2.95
 Summary: Upload or schedule videos to TikTok with viral TikTok sounds and hashtags.
 Project-URL: Homepage, https://github.com/haziq-exe/TikTokAutoUploader
 Author-email: HAZIQ <haziqmk123@gmail.com>
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Requires-Dist: inference>=0.18.1
 Requires-Dist: pillow>=8.0.0
 Requires-Dist: playwright>=1.0.0
 Requires-Dist: requests>=2.0.0
@@ -30,13 +31,13 @@ Description-Content-Type: text/markdown
 
 
 <p align="center">
-  <img src="READMEimage/Image.png" alt="" width="400"/>
+  <img src="READMEimage/READMEimg.png" alt="" width="150"/>
 </p>
 
 ## 🚀 Features
 
-- **🔐 Bypass/Auto Solve Captchas:** No more manual captcha solving; fully automated process!
-- **🎵 Use TikTok Sounds:** Seamlessly add popular TikTok sounds to your videos.
+- **🔐 Bypass/Auto Solve Captchas:** No need to worry about any captchas interrupting the process, they'll be solved!
+- **🎵 Use TikTok Sounds:** Go viral by seamlessly adding popular TikTok sounds to your videos.
 - **🗓 Schedule Uploads:** Upload videos at specific times or upto 10 days in advance with our scheduling feature.
 - **🔍 Copyright Check:** Ensure your video is safe from copyright claims before uploading.
 - **🏷 Add Working Hashtags:** Increase your reach by adding effective hashtags that actually work.
@@ -59,23 +60,22 @@ pip install tiktokautouploader
    - **Note:** The necessary JavaScript dependencies (`playwright`,`playwright-extra`, `puppeteer-extra-plugin-stealth`) will be AUTOMATICALLY installed the first time you run the function, so you don't need to install them manually. Make sure that `npm` (Node.js package manager) is available in your system's PATH.
 
 
-2. **Browser Binaries:** If you don't have them already, you'll need to install the chromium browser binary for `playwright`.
+2. **Browser Binaries:** If you don't have them already, you'll need to install the browser binaries for `playwright`.
 
-To do so, just run the following command AFTER installing the package:
-
-```bash
-python -m playwright install chromium
-```
+     to do so, just run the following command AFTER installing the package:
+        
+    ```bash
+    python -m playwright install
+    ```
 
 
 ## 📝 Quick-Start
 
-Here's how to upload a video to TikTok with hashtags using `tiktokautouploader`:
-
-NOTE: It is highly recommended you read DOCUMENTATION.md before using the library.
-
+**NOTE:** It is highly recommended you read DOCUMENTATION.md before using the library.
 The first time you run the code, you will be prompted to log-in, this will only occur the first time the function is used. Check documentation for more info.
 
+## Upload with hashtags
+
 ```python
 from tiktokautouploader import upload_tiktok
 
@@ -115,6 +115,7 @@ upload_tiktok(video=video_path, description=description, hashtags=hashtags, copy
 - **Maximize your reach:** Add popular sounds and effective hashtags that work to boost visibility.
 - **Stay compliant:** Built-in copyright checks to avoid unforeseen takedowns.
 - **Convenient scheduling:** Post at the right time, even when you're away.
+- **Much faster than manually uploading:** Drastically reduce the time you need to upload videos, just click one button and be done much quicker!
 
 ## 🛠 Dependencies
 
@@ -130,7 +131,7 @@ These will be automatically installed when you install the package.
 
 ## 👤 Author
 
-Created by **Haziq Khalid**. Feel free to reach out at [haziqmk123@gmail.com](mailto:haziqmk123@gmail.com) or my LinkedIn.
+Created by **Haziq**. Feel free to reach out at [haziqmk123@gmail.com](mailto:haziqmk123@gmail.com)
 
 ## 📄 License
 

tiktokautouploader-2.95.dist-info/RECORD

@@ -0,0 +1,7 @@
+tiktokautouploader/__init__.py,sha256=u7OWCK_u68ST8dfrkSF4Yw44CJOzV9NXI6ASRuoDfmE,64
+tiktokautouploader/function.py,sha256=PhHDU2GqteX5MqsPYQiyYfT09XHbLSG3_ydH9j4QHJE,33619
+tiktokautouploader/Js_assets/login.js,sha256=SLhtPYo8ZfTRUnbR7Xqp084lSuAOqIWUxi75FlFH3vs,966
+tiktokautouploader-2.95.dist-info/METADATA,sha256=5fJDsAptfF53htSHKekKk8JGcoWdrS58LS-sucWOj30,5033
+tiktokautouploader-2.95.dist-info/WHEEL,sha256=fl6v0VwpzfGBVsGtkAkhILUlJxROXbA3HvRL6Fe3140,105
+tiktokautouploader-2.95.dist-info/licenses/LICENSE.md,sha256=hYds_VJIpnS5gC73WhuWk2IY_e9BWjuEJthQCb9ThyU,1073
+tiktokautouploader-2.95.dist-info/RECORD,,

tiktokautouploader-2.86.dist-info/RECORD

@@ -1,7 +0,0 @@
-tiktokautouploader/__init__.py,sha256=u7OWCK_u68ST8dfrkSF4Yw44CJOzV9NXI6ASRuoDfmE,64
-tiktokautouploader/function.py,sha256=7pZ--_6IyX69Ayf-rzXMd9PlzqzcVwAFrljIk8MwACI,31506
-tiktokautouploader/Js_assets/login.js,sha256=SLhtPYo8ZfTRUnbR7Xqp084lSuAOqIWUxi75FlFH3vs,966
-tiktokautouploader-2.86.dist-info/METADATA,sha256=cSuoQsxyjQfK4pzJLf7eqoCf4nDp9bOESwDBHJS1l3Q,4879
-tiktokautouploader-2.86.dist-info/WHEEL,sha256=fl6v0VwpzfGBVsGtkAkhILUlJxROXbA3HvRL6Fe3140,105
-tiktokautouploader-2.86.dist-info/licenses/LICENSE.md,sha256=hYds_VJIpnS5gC73WhuWk2IY_e9BWjuEJthQCb9ThyU,1073
-tiktokautouploader-2.86.dist-info/RECORD,,