neogram 9.3__tar.gz → 9.3.1__tar.gz

{neogram-9.3 → neogram-9.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: neogram
-Version: 9.3
+Version: 9.3.1
 Summary: neogram is a lightweight Python module for working with the Telegram Bot API and AI. It combines simple Telegram workflows with powerful features like text and image generation, translation, and more.
 Author: SiriLV
 Author-email: siriteamrs@gmail.com
@@ -14,6 +14,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests>=2.32.5
 Requires-Dist: bs4>=0.0.2
+Requires-Dist: curl_cffi>=0.14.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -25,7 +26,7 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# 📚 Документация neogram v9.3
+# 📚 Документация neogram v9.3.01
 
 **Установка:**
 
@@ -88,7 +89,7 @@ bot = Bot(token="YOUR_TOKEN", timeout=60)
 *   `translate(text, lang)`: Перевод текста (через Google Translate).
 *   `short_url(long_url)`: Сокращение ссылок (clck.ru).
 *   `gen_ai_response(model, messages)`: Генерация ответа (Qwen/GPT OSS).
-*   `gen_gpt(messages)`: Генерация через ItalyGPT.
+*   `perplexity_ask(model, query)`: Генерация через PerplexityAI
 *   `encode_base64(path)`: Кодирование файла в base64.
 *   `run_in_bg(func, ...)`: Запуск функции в отдельном потоке.
 

{neogram-9.3 → neogram-9.3.1}/README.md

@@ -1,4 +1,4 @@
-# 📚 Документация neogram v9.3
+# 📚 Документация neogram v9.3.01
 
 **Установка:**
 
@@ -61,7 +61,7 @@ bot = Bot(token="YOUR_TOKEN", timeout=60)
 *   `translate(text, lang)`: Перевод текста (через Google Translate).
 *   `short_url(long_url)`: Сокращение ссылок (clck.ru).
 *   `gen_ai_response(model, messages)`: Генерация ответа (Qwen/GPT OSS).
-*   `gen_gpt(messages)`: Генерация через ItalyGPT.
+*   `perplexity_ask(model, query)`: Генерация через PerplexityAI
 *   `encode_base64(path)`: Кодирование файла в base64.
 *   `run_in_bg(func, ...)`: Запуск функции в отдельном потоке.
 

{neogram-9.3 → neogram-9.3.1}/neogram/ii.py

@@ -1,5 +1,6 @@
 import requests, json, base64, threading, re, bs4
 from typing import Union, BinaryIO
+from curl_cffi.requests import Session
 
 #Блок - Нейросети
 class OnlySQ:
@@ -56,28 +57,28 @@ class OnlySQ:
             print(f"OnlySQ(get_models): {e}")
             return []
 
-    def generate_answer(self, model: str = "gpt-5.2-chat", messages: dict = None) -> str:
+    def generate_answer(self, model: str = "gpt-5.2-chat", messages: dict = None, key: str = "openai") -> str:
         """Генерация ответа с использованием onlysq"""
         try:
             if messages is None:
                 raise ValueError("Забыли указать messages")
             else:
                 payload = {"model": model, "request": {"messages": messages}}
-                response = requests.post("http://api.onlysq.ru/ai/v2", json=payload, headers={"Authorization":"Bearer openai"})
+                response = requests.post("http://api.onlysq.ru/ai/v2", json=payload, headers={"Authorization": f"Bearer {key}"})
                 response.raise_for_status()
                 return response.json()["choices"][0]["message"]["content"]
         except Exception as e:
             print(f"OnlySQ(generate_answer): {e}")
             return "Error"
     
-    def generate_image(self, model: str = "flux", prompt: str = None, ratio: str = "16:9", filename: str = 'image.png') -> bool:
+    def generate_image(self, model: str = "flux", prompt: str = None, ratio: str = "16:9", filename: str = 'image.png', key: str = "openai") -> bool:
         """Генерация фотографии с использованием onlysq"""
         try:
             if prompt is None:
                 raise ValueError("Забыли указать prompt")
             else:
                 payload = {"model": model, "prompt": prompt, "ratio": ratio}
-                response = requests.post("https://api.onlysq.ru/ai/imagen", json=payload, headers={"Authorization":"Bearer openai"})
+                response = requests.post("https://api.onlysq.ru/ai/imagen", json=payload, headers={"Authorization": f"Bearer {key}"})
                 if response.status_code == 200:
                     img_bytes = base64.b64decode(response.json()["files"][0])
                     with open(filename, 'wb') as f:
@@ -186,20 +187,161 @@ class Deef:
             print(f"Deef(gen_ai_response): {e}")
             return {"reasoning": "Error", "answer": "Error", "status": "unknown", "cluster_info": None}
     
-    def gen_gpt(self, messages: list = None) -> str:
-        """Генерация текста с помощью GPT-4o"""
-        try:
-            if messages is None:
-                raise ValueError("Забыли указать messages")
-            else:
-                r = requests.post("https://italygpt.it/api/chat", json={"messages": messages, "stream": True}, headers={"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36", "Accept": "text/event-stream"})
-                if r.status_code == 200:
-                    return r.text
-                else:
-                    return "Error"
-        except Exception as e:
-            print(f"Deef(gen_gpt): {e}")
-            return "Error"
+    def perplexity_ask(self, model: str, query: str) -> dict:
+        """
+        Вывод: словари с ключом 'type' и данными:
+            - {"type": "text", "content": "..."}
+            - {"type": "sources", "sources": [...]}
+            - {"type": "reasoning", "content": "...", "status": "thinking"|"done"}
+            - {"type": "media", "items": [...]}
+            - {"type": "followups", "followups": [...]}
+            - {"type": "finish", "reason": "stop"}
+        """
+        MODELS = [
+            "turbo", "gpt41", "gpt5", "gpt5_thinking", "o3",
+            "o3pro", "claude2", "claude37sonnetthinking", "claude40opus", "claude40opusthinking",
+            "claude41opusthinking", "claude45sonnet", "claude45sonnetthinking", "experimental", "grok",
+            "grok4", "gemini2flash", "pplx_pro", "pplx_pro_upgraded", "pplx_alpha",
+            "pplx_beta", "comet_max_assistant", "o3_research", "o3pro_research", "claude40sonnet_research",
+            "claude40sonnetthinking_research", "claude40opus_research", "claude40opusthinking_research", "o3_labs", "o3pro_labs",
+            "claude40sonnetthinking_labs", "claude40opusthinking_labs", "o4mini", "o1", "gpt4o",
+            "gpt45", "gpt4", "o3mini", "claude35haiku", "llama_x_large",
+            "mistral", "claude3opus", "gemini", "pplx_reasoning", "r1"]
+        BASE_URL = "https://www.perplexity.ai"
+        if model not in MODELS:
+            model = MODELS[0]
+        frontend_uid = str(uuid.uuid4())
+        frontend_context_uuid = str(uuid.uuid4())
+        visitor_id = str(uuid.uuid4())
+        headers = {
+            "accept": "text/event-stream",
+            "accept-language": "en-US,en;q=0.9",
+            "cache-control": "no-cache",
+            "content-type": "application/json",
+            "origin": BASE_URL,
+            "referer": f"{BASE_URL}/",
+            "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.0.0 Safari/537.36",
+            "x-perplexity-request-reason": "perplexity-query-state-provider"}
+        with Session(headers=headers, timeout=300, impersonate="chrome") as session:
+            resp = session.get(f"{BASE_URL}/api/auth/session")
+            user_id = resp.json().get("user", {}).get("id")
+            if model == "auto":
+                model = "pplx_pro" if user_id else "turbo"
+            data = {
+                "params": {
+                    "attachments": [],
+                    "language": "en-US",
+                    "timezone": "America/New_York",
+                    "followup_source": "link",
+                    "search_focus": "internet",
+                    "source": "default",
+                    "sources": ["edgar", "social", "web", "scholar"],
+                    "frontend_uuid": frontend_uid,
+                    "mode": "concise",
+                    "model_preference": model,
+                    "visitor_id": visitor_id,
+                    "frontend_context_uuid": frontend_context_uuid,
+                    "prompt_source": "user",
+                    "query_source": "followup",
+                    "use_schematized_api": True,
+                    "supported_block_use_cases": [
+                        "answer_modes", "media_items", "knowledge_cards", "inline_entity_cards",
+                        "place_widgets", "finance_widgets", "prediction_market_widgets", "sports_widgets",
+                        "flight_status_widgets", "news_widgets", "shopping_widgets", "jobs_widgets",
+                        "search_result_widgets", "inline_images", "inline_assets", "placeholder_cards",
+                        "diff_blocks", "inline_knowledge_cards", "entity_group_v2", "refinement_filters",
+                        "canvas_mode", "maps_preview", "answer_tabs", "price_comparison_widgets",
+                        "preserve_latex", "generic_onboarding_widgets", "in_context_suggestions"
+                    ],
+                    "version": "2.18"
+                }, "query_str": query}
+            response = session.post(f"{BASE_URL}/rest/sse/perplexity_ask", json=data)
+            if response.status_code >= 400:
+                raise Exception(f"HTTP {response.status_code}")
+            content = response.content
+            if isinstance(content, bytes):
+                content = content.decode('utf-8')
+            full_response = ""
+            full_reasoning = ""
+            sources_sent = False
+            for line in content.split('\n'):
+                line = line.strip()
+                if not line.startswith('data: '):
+                    continue
+                data_str = line[6:]
+                if not data_str or data_str == '[DONE]':
+                    continue
+                try:
+                    json_data = json.loads(data_str)
+                except json.JSONDecodeError:
+                    continue
+                for block in json_data.get("blocks", []):
+                    intended_usage = block.get("intended_usage", "")
+                    if intended_usage == "sources_answer_mode":
+                        sources_block = block.get("sources_mode_block", {})
+                        web_results = sources_block.get("web_results", [])
+                        if web_results and not sources_sent:
+                            yield {"type": "sources", "sources": web_results}
+                            sources_sent = True
+                        continue
+                    if intended_usage == "media_items":
+                        media_block = block.get("media_block", {})
+                        media_items = media_block.get("media_items", [])
+                        if media_items:
+                            items = []
+                            for item in media_items:
+                                items.append({
+                                    "media_type": item.get("medium", "unknown"),
+                                    "url": item.get("url", ""),
+                                    "title": item.get("name", ""),
+                                    "width": item.get("image_width"),
+                                    "height": item.get("image_height")
+                                })
+                            yield {"type": "media", "items": items}
+                        continue
+                    if intended_usage in ("pro_search_steps", "plan"):
+                        plan_block = block.get("plan_block", {})
+                        if plan_block:
+                            goals = plan_block.get("goals", [])
+                            progress = plan_block.get("progress", "")
+                            for goal in goals:
+                                if isinstance(goal, str) and goal:
+                                    yield {"type": "reasoning", "content": goal, "status": "thinking"}
+                            if progress == "DONE":
+                                yield {"type": "reasoning", "content": "", "status": "done"}
+                        diff_block = block.get("diff_block", {})
+                        if diff_block.get("field") == "plan_block":
+                            for patch in diff_block.get("patches", []):
+                                if patch.get("path", "").startswith("/goals"):
+                                    value = patch.get("value", "")
+                                    if isinstance(value, str) and value:
+                                        new_reasoning = value[len(full_reasoning):] if value.startswith(full_reasoning) else value
+                                        if new_reasoning:
+                                            full_reasoning = value if value.startswith(full_reasoning) else full_reasoning + value
+                                            yield {"type": "reasoning", "content": new_reasoning, "status": "thinking"}
+                        continue
+                    if intended_usage != "ask_text_0_markdown":
+                        continue
+                    diff_block = block.get("diff_block", {})
+                    if diff_block.get("field") != "markdown_block":
+                        continue
+                    for patch in diff_block.get("patches", []):
+                        value = patch.get("value", "")
+                        if isinstance(value, dict) and "chunks" in value:
+                            text = "".join(value.get("chunks", []))
+                            if text and len(text) > len(full_response):
+                                new_text = text[len(full_response):]
+                                full_response = text
+                                yield {"type": "text", "content": new_text}
+                        elif patch.get("op") == "add" and isinstance(value, str) and value:
+                            full_response += value
+                            yield {"type": "text", "content": value}
+                if "related_query_items" in json_data:
+                    followups = [i.get("text", "") for i in json_data["related_query_items"]]
+                    if followups:
+                        yield {"type": "followups", "followups": followups}
+                if json_data.get("status") == "COMPLETED":
+                    yield {"type": "finish", "reason": "stop"}
 
 
 class ChatGPT:

{neogram-9.3 → neogram-9.3.1}/neogram.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: neogram
-Version: 9.3
+Version: 9.3.1
 Summary: neogram is a lightweight Python module for working with the Telegram Bot API and AI. It combines simple Telegram workflows with powerful features like text and image generation, translation, and more.
 Author: SiriLV
 Author-email: siriteamrs@gmail.com
@@ -14,6 +14,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests>=2.32.5
 Requires-Dist: bs4>=0.0.2
+Requires-Dist: curl_cffi>=0.14.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -25,7 +26,7 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# 📚 Документация neogram v9.3
+# 📚 Документация neogram v9.3.01
 
 **Установка:**
 
@@ -88,7 +89,7 @@ bot = Bot(token="YOUR_TOKEN", timeout=60)
 *   `translate(text, lang)`: Перевод текста (через Google Translate).
 *   `short_url(long_url)`: Сокращение ссылок (clck.ru).
 *   `gen_ai_response(model, messages)`: Генерация ответа (Qwen/GPT OSS).
-*   `gen_gpt(messages)`: Генерация через ItalyGPT.
+*   `perplexity_ask(model, query)`: Генерация через PerplexityAI
 *   `encode_base64(path)`: Кодирование файла в base64.
 *   `run_in_bg(func, ...)`: Запуск функции в отдельном потоке.
 

{neogram-9.3 → neogram-9.3.1}/neogram.egg-info/requires.txt

@@ -1,2 +1,3 @@
 requests>=2.32.5
 bs4>=0.0.2
+curl_cffi>=0.14.0

{neogram-9.3 → neogram-9.3.1}/setup.py

@@ -2,13 +2,13 @@ from setuptools import setup, find_packages
 
 setup(
     name='neogram',
-    version='9.3',
+    version='9.3.01',
     description='neogram is a lightweight Python module for working with the Telegram Bot API and AI. It combines simple Telegram workflows with powerful features like text and image generation, translation, and more.',
     author='SiriLV',
     author_email='siriteamrs@gmail.com',
     packages=find_packages(),
     python_requires='>=3.10',
-    install_requires=['requests>=2.32.5', 'bs4>=0.0.2'],
+    install_requires=['requests>=2.32.5', 'bs4>=0.0.2', 'curl_cffi>=0.14.0'],
     classifiers=[
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.10',