Merge branch 'master' into dependabot/pip/isort-7.0.0

Author: subzeroid

.github/workflows/python-package.yml

@@ -121,7 +121,7 @@ jobs:
       # upload artifact for dev build
       - name: Upload coverage results artifact
         if: github.ref != 'refs/heads/main'
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: docs-site
           path: site/

README.md

@@ -25,6 +25,27 @@ The instagrapi more suits for testing or research than a working business!
 * [InstaSurfBot](https://t.me/InstaSurfBot) telegram bot for downloading medias from Instagram ❤️
 * [OSINTagramBot](https://t.me/OSINTagramBot) telegram bot for OSINT on Instagram 🕵️‍♂️
 
+
+### 💰 [HikerAPI Affiliate Program](https://hikerapi.com/help/affiliate) — Up to 50% Commission!
+
+Refer users to HikerAPI and earn a percentage of their API spending:
+
+| Plan | Commission |
+|------|------------|
+| Start ($0.02/req) | **50%** |
+| Standard ($0.001/req) | **25%** |
+| Business ($0.00069/req) | **15%** |
+| Ultra ($0.0006/req) | **10%** |
+
+**How it works:**
+1. Create your promo code in the [dashboard](https://hikerapi.com/affiliate)
+2. Share it with your audience (in your GitHub repositories)
+3. Earn commission on every request they make
+
+**Payouts:** USDT (TRC-20 or ERC-20), minimum $500
+
+------
+
 [![Package](https://github.com/subzeroid/instagrapi/actions/workflows/python-package.yml/badge.svg?branch=master&1)](https://github.com/subzeroid/instagrapi/actions/workflows/python-package.yml)
 [![PyPI](https://img.shields.io/pypi/v/instagrapi)](https://pypi.org/project/instagrapi/)
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/instagrapi)

instagrapi/config.py

@@ -10,6 +10,31 @@
     "{dpi}; {resolution}; {manufacturer}; "
     "{model}; {device}; {cpu}; {locale}; {version_code})"
 )
+
+# Default device profile (hardware/system) and app version settings.
+DEVICE_SETTINGS = {
+    "android_version": 26,
+    "android_release": "8.0.0",
+    "dpi": "480dpi",
+    "resolution": "1080x1920",
+    "manufacturer": "OnePlus",
+    "device": "devitron",
+    "model": "6T Dev",
+    "cpu": "qcom",
+}
+APP_SETTINGS = {
+    "364.0.0.35.86": {
+        "app_version": "364.0.0.35.86",
+        "version_code": "374010953",
+        "bloks_versioning_id": "8ccf54aad76788a6ca03ddfc33afcdcf692f2f5a3ba814ea73d5facba7fa2c2d",
+    },
+    "385.0.0.47.74": {
+        "app_version": "385.0.0.47.74",
+        "version_code": "378906843",
+        "bloks_versioning_id": "a8973d49a9cc6a6f65a4997c10216ce2a06f65a517010e64885e92029bb19221",
+    },
+}
+
 # Instagram 76.0.0.15.395 (iPhone9,2; iOS 10_0_2; en_US; en-US; scale=2.61; 1080x1920) AppleWebKit/420+
 # Instagram 208.0.0.32.135 (iPhone; iOS 14_7_1; en_US; en-US; scale=2.61; 1080x1920) AppleWebKit/605.1.15
 

instagrapi/mixins/auth.py

@@ -82,7 +82,7 @@ def get_prefill_candidates(self, login: bool = False) -> Dict:
         data = {
             "android_device_id": self.android_device_id,
             "client_contact_points": '[{"type":"omnistring","value":"%s","source":"last_login_attempt"}]'
-            % self.username,
+                                     % self.username,
             "phone_id": self.phone_id,
             "usages": '["account_recovery_omnibox"]',
             "logged_in_user_ids": "[]",  # "[\"123456789\",\"987654321\"]",
@@ -188,7 +188,7 @@ def login_flow(self) -> bool:
         return all(check_flow)
 
     def get_timeline_feed(
-        self, reason: TIMELINE_FEED_REASON = "pull_to_refresh", max_id: str = None
+            self, reason: TIMELINE_FEED_REASON = "pull_to_refresh", max_id: str = None
     ) -> Dict:
         """
         Get your timeline feed
@@ -246,7 +246,7 @@ def get_timeline_feed(
         )
 
     def get_reels_tray_feed(
-        self, reason: REELS_TRAY_REASON = "pull_to_refresh"
+            self, reason: REELS_TRAY_REASON = "pull_to_refresh"
     ) -> Dict:
         """
         Get your reels tray feed
@@ -305,8 +305,10 @@ class LoginMixin(PreLoginFlowMixin, PostLoginFlowMixin):
     ig_www_claim = ""  # e.g. hmac.AR2uidim8es5kYgDiNxY0UG_ZhffFFSt8TGCV5eA1VYYsMNx
 
     def __init__(self):
+        self.bloks_versioning_id = "ce555e5500576acd8e84a66018f54a05720f2dce29f0bb5a1f97f0c10d6fac48"
         self.user_agent = None
         self.settings = None
+        self.override_app_version = False
 
     def init(self) -> bool:
         """
@@ -327,10 +329,6 @@ def init(self) -> bool:
             self.settings.get("timezone_offset", self.timezone_offset)
         )
         self.set_device(self.settings.get("device_settings"))
-        # c7aeefd59aab78fc0a703ea060ffb631e005e2b3948efb9d73ee6a346c446bf3
-        self.bloks_versioning_id = (
-            "ce555e5500576acd8e84a66018f54a05720f2dce29f0bb5a1f97f0c10d6fac48"
-        )  # this param is constant and will change by Instagram app version
         self.set_user_agent(self.settings.get("user_agent"))
         self.set_uuids(self.settings.get("uuids") or {})
         self.set_locale(self.settings.get("locale", self.locale))
@@ -377,11 +375,11 @@ def login_by_sessionid(self, sessionid: str) -> bool:
         return True
 
     def login(
-        self,
-        username: Union[str, None] = None,
-        password: Union[str, None] = None,
-        relogin: bool = False,
-        verification_code: str = "",
+            self,
+            username: Union[str, None] = None,
+            password: Union[str, None] = None,
+            relogin: bool = False,
+            verification_code: str = "",
     ) -> bool:
         """
         Login
@@ -603,20 +601,26 @@ def set_settings(self, settings: Dict) -> bool:
         self.init()
         return True
 
-    def load_settings(self, path: Union[str, Path]) -> Dict:
+    def load_settings(self, path: Union[str, Path], override_app_version: bool = False) -> Dict:
         """
         Load session settings
 
         Parameters
         ----------
         path: Path
             Path to storage file
+        override_app_version: bool, optional
+            Mismatched app_version/version_code/bloks_versioning_id may
+            increase risk. If True, override with a known version from
+            APP_SETTINGS (in memory). Call dump_settings() to persist.
+
 
         Returns
         -------
         Dict
             Current session settings as a Dict
         """
+        self.override_app_version = override_app_version
         with open(path, "r") as fp:
             self.set_settings(json.load(fp))
             return self.settings
@@ -652,22 +656,77 @@ def set_device(self, device: Dict = None, reset: bool = False) -> bool:
         bool
             A boolean value
         """
-        self.device_settings = device or {
-            "app_version": "269.0.0.18.75",
-            "android_version": 26,
-            "android_release": "8.0.0",
-            "dpi": "480dpi",
-            "resolution": "1080x1920",
-            "manufacturer": "OnePlus",
-            "device": "devitron",
-            "model": "6T Dev",
-            "cpu": "qcom",
-            "version_code": "314665256",
-        }
-        self.settings["device_settings"] = self.device_settings
+        device = device or {}
+        self.device_settings = dict(config.DEVICE_SETTINGS)
+        self.device_settings.update(device)
+        seed = None
+        if self.settings:
+            uuids = self.settings.get("uuids") or {}
+            seed = uuids.get("uuid")
+        self.set_app(seed=seed)
         if reset:
             self.set_uuids({})
-            # self.settings = self.get_settings()
+        return True
+
+    def set_app(self, app: Union[str, Dict] = None, seed: str = None) -> bool:
+        """
+        Helper to set app version settings
+
+        Parameters
+        ----------
+        app: Union[str, Dict], optional
+            App version string or settings dict
+        seed: str, optional
+            Seed used for stable app selection
+
+        Returns
+        -------
+        bool
+            A boolean value
+        """
+        app_keys = ("app_version", "version_code", "bloks_versioning_id")
+        if not getattr(self, "device_settings", None):
+            self.device_settings = dict(config.DEVICE_SETTINGS)
+        if not config.APP_SETTINGS:
+            raise ValueError("APP_SETTINGS is empty")
+        override_app_version = bool(getattr(self, "override_app_version", False))
+
+        def apply_settings(app_settings: Dict) -> None:
+            for key in app_keys:
+                val = app_settings.get(key)
+                if val:
+                    self.device_settings[key] = val
+
+        def pick_by_seed() -> Dict:
+            app_values = list(config.APP_SETTINGS.values())
+            if seed:
+                digest = hashlib.sha256(seed.encode("utf-8")).hexdigest()
+                idx = int(digest, 16) % len(app_values)
+                return app_values[idx]
+            return random.choice(app_values)
+
+        if app:
+            if isinstance(app, str):
+                matched = config.APP_SETTINGS.get(app)
+                if not matched:
+                    raise ValueError(f"Unknown app_version: {app}")
+                apply_settings(matched)
+            else:
+                apply_settings(dict(app))
+        else:
+            app_version = self.device_settings.get("app_version")
+            matched = config.APP_SETTINGS.get(app_version) if app_version else None
+            if matched:
+                apply_settings(matched)
+            else:
+                if override_app_version or not app_version:
+                    apply_settings(pick_by_seed())
+
+        if override_app_version:
+            self.set_user_agent()
+        self.bloks_versioning_id = self.device_settings.get("bloks_versioning_id")
+        if self.settings is not None:
+            self.settings["device_settings"] = self.device_settings
         return True
 
     def set_user_agent(self, user_agent: str = "", reset: bool = False) -> bool:

instagrapi/mixins/private.py

@@ -166,7 +166,7 @@ def base_headers(self):
             "X-IG-Android-ID": self.android_device_id,
             "X-IG-Timezone-Offset": str(self.timezone_offset),
             "X-IG-Connection-Type": "WIFI",
-            "X-IG-Capabilities": "3brTvx0=",  # "3brTvwE=" in instabot
+            "X-IG-Capabilities": "3brTv10=",  # "3brTvwE=" in instabot
             "X-IG-App-ID": self.app_id,
             "Priority": "u=3",
             "User-Agent": self.user_agent,

instagrapi/types.py

@@ -173,9 +173,10 @@ class SharedMediaImageCandidate(TypesBaseModel):
 
     estimated_scans_sizes: List[int] = []
     height: int
-    scans_profile: str
+    scans_profile: Optional[str] = None
     url: str
     width: int
+    is_spatial_image: Optional[bool] = None
 
 
 class ScrubberSpritesheetInfo(TypesBaseModel):
@@ -349,6 +350,37 @@ class ClipsOriginalSoundInfo(TypesBaseModel):
     fb_downstream_use_xpost_metadata: ClipsFbDownstreamUseXpostMetadata
 
 
+class ClipsReusableTextColor(TypesBaseModel):
+    """Color information for reusable text in clips"""
+
+    count: int
+    hex_rgba_color: str
+
+
+class ClipsReusableTextInfo(TypesBaseModel):
+    """Reusable text information for clips"""
+
+    alignment: str
+    end_time_ms: float
+    font_size: float
+    height: float
+    id: str
+    is_animated: bool
+    offset_x: float
+    offset_y: float
+    rotation_degree: float
+    scale: float
+    start_time_ms: float
+    text: str
+    text_emphasis_mode: str
+    text_format_type: str
+    width: float
+    z_index: int
+    effects: str = ""
+    animation: str = ""
+    colors: List[ClipsReusableTextColor] = []
+
+
 class ClipsMetadata(TypesBaseModel):
     """Complete clips metadata structure for Media objects"""
 
@@ -382,7 +414,7 @@ class ClipsMetadata(TypesBaseModel):
     originality_info: Optional[dict] = None
     reels_on_the_rise_info: Optional[dict] = None
     reusable_text_attribute_string: Optional[str] = None
-    reusable_text_info: Optional[dict] = None
+    reusable_text_info: Optional[List[ClipsReusableTextInfo]] = None
     shopping_info: Optional[dict] = None
     show_achievements: bool = False
     template_info: Optional[dict] = None

pyproject.toml

@@ -82,12 +82,12 @@ Repository = "https://github.com/subzeroid/instagrapi"
 [project.optional-dependencies]
 test = [
     "flake8==7.3.0",
-    "Pillow==11.3.0",
+    "Pillow==12.1.0",
     "isort==7.0.0",
     "bandit==1.8.6",
     "mike==2.1.3",
     "markdown-include==0.8.1",
-    "mkdocs-material==9.7.0",
+    "mkdocs-material==9.7.1",
     "mkdocs-minify-html-plugin>=0.3.1",
     "mkdocstrings==0.30.1",
     "pytest-xdist==3.8.0",

requirements-docs.txt

@@ -7,8 +7,8 @@ setuptools==68.2.2
 
 markdown-include==0.8.1
 mkdocs==1.6.1
-mkdocs-material==9.7.0
+mkdocs-material==9.7.1
 mkdocs-minify-plugin==0.8.0
 mkdocs-redirects==1.2.2
-mkdocstrings[python]==0.30.1
+mkdocstrings[python]==1.0.0
 mkdocs-autorefs>=1.0.0

requirements-test.txt

@@ -1,5 +1,5 @@
 flake8==7.3.0
-Pillow==11.3.0
+Pillow==12.1.0
 isort==7.0.0
 bandit==1.8.6
 pytest-xdist==3.8.0