mirror of
https://github.com/migatu/conjurer.git
synced 2026-07-14 21:38:38 +00:00
Compare commits
37 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c4fa88e8ee | |||
| d43980c976 | |||
| f6607440ad | |||
| 8750430cde | |||
| 640f8bd824 | |||
| bf2835cfc7 | |||
| a0663d32e0 | |||
| 534b1feb58 | |||
| bb9cdc483d | |||
| 04799a8ac1 | |||
| 75e2205b3d | |||
| 75014d2ec9 | |||
| 28685780f3 | |||
| 609dbae864 | |||
| 7ef1502249 | |||
| 2f13853084 | |||
| 9f262e5d2f | |||
| ba80523d6c | |||
| af20f6128c | |||
| 92f2992b97 | |||
| ab1ebed5f4 | |||
| 6dc4c9d1b3 | |||
| c49615aab6 | |||
| 340a2e706b | |||
| 5204c257cf | |||
| 3126ad5266 | |||
| 2fa4771b54 | |||
| dd869cef36 | |||
| 62b4046366 | |||
| f0bd6c4015 | |||
| 6cc43ed16d | |||
| 5b8d1ebb27 | |||
| c0326288ff | |||
| 97f43bc6a7 | |||
| b52e9be5f9 | |||
| cae1f48035 | |||
| 894235569e |
+2
-2
@@ -294,7 +294,7 @@ class Events(commands.Cog):
|
||||
bartender,
|
||||
MESSAGE_TABLE,
|
||||
username,
|
||||
"CONVERSATION",
|
||||
"GENERAL",
|
||||
)
|
||||
|
||||
await discord_friendly_reply(message, result)
|
||||
@@ -332,7 +332,7 @@ class Events(commands.Cog):
|
||||
True,
|
||||
MESSAGE_TABLE,
|
||||
username,
|
||||
"RANDOM",
|
||||
"GENERAL",
|
||||
)
|
||||
await discord_friendly_reply(
|
||||
message, f"Sorki, cenzura: {resp}. Jak chcesz to są kanały na nudle #sexy-foteczky i #kanal-do-fapania *Na ekranie pojawia się: {e}"
|
||||
|
||||
+208
-167
@@ -5,6 +5,7 @@ import random
|
||||
|
||||
import openai
|
||||
import tiktoken
|
||||
import time
|
||||
from other_functions import discord_friendly_send
|
||||
from constants import (
|
||||
ASSISTANTS,
|
||||
@@ -18,18 +19,67 @@ from constants import (
|
||||
OPENAICLIENT,
|
||||
SYSTEM_GPT_SETTINGS,
|
||||
WORD_REACTIONS,
|
||||
CHEAP_MODEL,
|
||||
LATEST_MODEL
|
||||
)
|
||||
|
||||
#this do per user
|
||||
# this do per user
|
||||
VECTOR_STORE_ID = -1
|
||||
def select_model(req_type: str, algo: str) -> str:
|
||||
# Jeżeli jawnie podano algorithm (i nie jest 'auto'/''):
|
||||
if algo and str(algo).strip().lower() not in ("auto",):
|
||||
# wyjątek: MUZYKA ma zawsze być tania — nadpisujemy TYLKO jeśli przyszedł domyślny 'gpt-4o'
|
||||
if req_type == "MUSIC" and algo.strip() in (LATEST_MODEL,):
|
||||
return CHEAP_MODEL
|
||||
return algo
|
||||
# Auto-dobór:
|
||||
if req_type == "MUSIC":
|
||||
return CHEAP_MODEL
|
||||
return LATEST_MODEL
|
||||
|
||||
|
||||
async def openai_call(messages, model, temperature=0.2):
|
||||
"""
|
||||
Responses API dla 4o/4.1*, fallback Chat Completions dla gpt-3.5-turbo.
|
||||
Zwraca czysty string odpowiedzi.
|
||||
"""
|
||||
logger = logging.getLogger("discord")
|
||||
|
||||
if model.startswith("gpt-3.5"):
|
||||
logger.info("3.5")
|
||||
# legacy path – bez zmian w Twoim kodzie wyżej/niżej
|
||||
resp = await OPENAICLIENT.chat.completions.create(
|
||||
model=model,
|
||||
messages=messages,
|
||||
temperature=temperature,
|
||||
)
|
||||
result = ""
|
||||
for choice in resp.choices:
|
||||
result += choice.message.content
|
||||
return result.strip()
|
||||
|
||||
else:
|
||||
logger.info("4.0+")
|
||||
# Responses API (zalecane dla 4o/4.1*)
|
||||
resp = await OPENAICLIENT.responses.create(
|
||||
model=model,
|
||||
temperature=temperature,
|
||||
input=messages,
|
||||
)
|
||||
# SDK zapewnia output_text dla zwykłych odpowiedzi
|
||||
return (getattr(resp.output_text, "output_text", None) or "").strip() or str(
|
||||
resp.output_text
|
||||
)
|
||||
|
||||
|
||||
def create_vector_store():
|
||||
# Create a vector store caled "Financial Statements"
|
||||
return OPENAICLIENT.beta.vector_stores.create_and_poll(name="Hammer Stash")
|
||||
#expires_after={
|
||||
#"anchor": "last_active_at",
|
||||
#"days": 7}
|
||||
#)
|
||||
# expires_after={
|
||||
# "anchor": "last_active_at",
|
||||
# "days": 7}
|
||||
# )
|
||||
|
||||
|
||||
def upload_files_to_vector_store(assistant):
|
||||
|
||||
@@ -37,15 +87,14 @@ def upload_files_to_vector_store(assistant):
|
||||
file_paths = ["edgar/goog-10k.pdf", "edgar/brka-10k.txt"]
|
||||
file_streams = [open(path, "rb") for path in file_paths]
|
||||
|
||||
#file = client.beta.vector_stores.files.create_and_poll(
|
||||
#vector_store_id="vs_abc123",
|
||||
#file_id="file-abc123"
|
||||
#)
|
||||
#batch = client.beta.vector_stores.file_batches.create_and_poll(
|
||||
#vector_store_id="vs_abc123",
|
||||
#file_ids=['file_1', 'file_2', 'file_3', 'file_4', 'file_5']
|
||||
#)
|
||||
|
||||
# file = client.beta.vector_stores.files.create_and_poll(
|
||||
# vector_store_id="vs_abc123",
|
||||
# file_id="file-abc123"
|
||||
# )
|
||||
# batch = client.beta.vector_stores.file_batches.create_and_poll(
|
||||
# vector_store_id="vs_abc123",
|
||||
# file_ids=['file_1', 'file_2', 'file_3', 'file_4', 'file_5']
|
||||
# )
|
||||
|
||||
# Use the upload and poll SDK helper to upload the files, add them to the vector store,
|
||||
# and poll the status of the file batch for completion.
|
||||
@@ -57,10 +106,11 @@ def upload_files_to_vector_store(assistant):
|
||||
print(file_batch.status)
|
||||
print(file_batch.file_counts)
|
||||
assistant = OPENAICLIENT.beta.assistants.update(
|
||||
assistant_id=assistant.id,
|
||||
tool_resources={"file_search": {"vector_store_ids": [VECTOR_STORE_ID]}},
|
||||
assistant_id=assistant.id,
|
||||
tool_resources={"file_search": {"vector_store_ids": [VECTOR_STORE_ID]}},
|
||||
)
|
||||
|
||||
|
||||
def delete_files_from_vector_store(assistant, file_id):
|
||||
result = OPENAICLIENT.beta.vector_stores.file_batches.delete(
|
||||
vector_store_id=VECTOR_STORE_ID, files=file_id
|
||||
@@ -69,8 +119,8 @@ def delete_files_from_vector_store(assistant, file_id):
|
||||
# You can print the status and the file counts of the batch to see the result of this operation.
|
||||
print(result)
|
||||
assistant = OPENAICLIENT.beta.assistants.update(
|
||||
assistant_id=assistant.id,
|
||||
tool_resources={"file_search": {"vector_store_ids": [VECTOR_STORE_ID]}},
|
||||
assistant_id=assistant.id,
|
||||
tool_resources={"file_search": {"vector_store_ids": [VECTOR_STORE_ID]}},
|
||||
)
|
||||
|
||||
|
||||
@@ -99,7 +149,15 @@ def num_tokens_from_string(message, model):
|
||||
|
||||
|
||||
async def handle_response(
|
||||
prompt, vykidailo, bartender, history, username, request_type
|
||||
prompt,
|
||||
vykidailo,
|
||||
bartender,
|
||||
history,
|
||||
username,
|
||||
request_type,
|
||||
algorithm="gpt-4o",
|
||||
none_request="",
|
||||
internal_retry: bool = False
|
||||
):
|
||||
"""
|
||||
Handle responses by appending them to a history, use OpenAI to
|
||||
@@ -115,182 +173,165 @@ async def handle_response(
|
||||
:param music: The "music" parameter is a boolean value that indicates whether the conversation is
|
||||
related to music or not. If it is True, the conversation history will be stored in a different file
|
||||
and the response will be generated using a different model
|
||||
:param request_type: The type of request being made, which can be "MUSIC", "RANDOM", "NONE" or "GENERAL"
|
||||
GENERAL is for regular conversations, MUSIC is for music-related requests,
|
||||
RANDOM is for random requests, and NONE is to not store the request in memory
|
||||
:param algorithm: The algorithm to be used for generating the response, default is "gpt-4o"
|
||||
:return: The function `handle_response` returns a tuple containing the `result` and `MESSAGE_TABLE`.
|
||||
"""
|
||||
logger = logging.getLogger("discord")
|
||||
logger.info("Wywolanie procedury openai z promptem: %s", prompt)
|
||||
temp = {"role": "user", "content": username + ":" + prompt}
|
||||
if vykidailo or bartender:
|
||||
logger.info("Administrator coś chciał")
|
||||
history.append(temp)
|
||||
if request_type == "MUSIC":
|
||||
with open(MEMORY_FIVE_MUZYKA, "r+", encoding=ENCODING) as file_music_memory:
|
||||
# First we load existing data into a dict.
|
||||
file_data = json.load(file_music_memory)
|
||||
# Join new_data with file_data inside emp_details
|
||||
file_data.append(temp)
|
||||
file_music_memory.seek(0)
|
||||
# convert back to json.
|
||||
json.dump(file_data, file_music_memory, indent=4)
|
||||
elif request_type == "RANDOM":
|
||||
with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as file_memory:
|
||||
# First we load existing data into a dict.
|
||||
file_data = json.load(file_memory)
|
||||
# Join new_data with file_data inside emp_details
|
||||
file_data.append(temp)
|
||||
file_memory.seek(0)
|
||||
# convert back to json.
|
||||
json.dump(file_data, file_memory, indent=4)
|
||||
model_to_use = select_model(request_type, algorithm)
|
||||
logger.info("Wybrany model: %s", model_to_use)
|
||||
if request_type == "MUSIC" and model_to_use == "gpt-4o-mini":
|
||||
try:
|
||||
# nic — normalnie pójdzie Responses API
|
||||
pass
|
||||
except Exception:
|
||||
model_to_use = "gpt-3.5-turbo"
|
||||
# --- 2) Budowa historii (token budget + reguły systemowe) ---
|
||||
# NOTE: ignorujemy przekazany 'history' jako listę (tak było wcześniej),
|
||||
# ale zwracamy aktualną tablicę do nadpisania w miejscach wołania (back-compat).
|
||||
base_system = GPT_SETTINGS[0] # zakładamy {"role":"system","content":...}
|
||||
history_msgs = []
|
||||
|
||||
if request_type != "NONE":
|
||||
history_msgs.append(base_system)
|
||||
chat_gpt_config_request_size = num_tokens_from_string(base_system, "gpt-4")
|
||||
|
||||
# Dynamiczne mikro-reguły (WORD_REACTIONS), jak w Twoim kodzie
|
||||
for slowo, reakcja in WORD_REACTIONS.items():
|
||||
if not reakcja[3]:
|
||||
content = f"Kiedy słyszysz {slowo} to reagujesz lub dzieje się to {reakcja[0]}"
|
||||
sys_msg = {"role": "system", "content": content}
|
||||
chat_gpt_config_request_size += num_tokens_from_string(sys_msg, "gpt-4")
|
||||
history_msgs.append(sys_msg)
|
||||
|
||||
# wybór właściwej tablicy pamięci i budżetu
|
||||
if request_type == "MUSIC":
|
||||
table = MESSAGE_TABLE_MUZYKA
|
||||
token_amount = 10700
|
||||
elif request_type in ("RANDOM", "GENERAL"):
|
||||
table = MESSAGE_TABLE
|
||||
token_amount = 10700
|
||||
else:
|
||||
table = []
|
||||
token_amount = 10000
|
||||
|
||||
# doklejanie historii od końca aż do limitu (zachowana kolejność czasowa)
|
||||
final_prompt = f"{username}:{prompt}"
|
||||
prompt_gpt_request_size = num_tokens_from_string({"role": "user", "content": final_prompt}, "gpt-4")
|
||||
|
||||
acc = []
|
||||
for msg in reversed(table):
|
||||
t = num_tokens_from_string(msg, "gpt-4")
|
||||
if chat_gpt_config_request_size + prompt_gpt_request_size + t <= token_amount:
|
||||
acc.append(msg)
|
||||
chat_gpt_config_request_size += t
|
||||
else:
|
||||
break
|
||||
# przywróć chronologicznie
|
||||
history_msgs.extend(reversed(acc))
|
||||
|
||||
# aktualny prompt
|
||||
history_msgs.append({"role": "user", "content": final_prompt})
|
||||
logger.info("Rozmiar zapytania (tok): %s", prompt_gpt_request_size) # tokeny już policzone wyżej
|
||||
|
||||
else:
|
||||
with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as file_memory:
|
||||
# First we load existing data into a dict.
|
||||
file_data = json.load(file_memory)
|
||||
# Join new_data with file_data inside emp_details
|
||||
file_data.append(temp)
|
||||
file_memory.seek(0)
|
||||
# convert back to json.
|
||||
json.dump(file_data, file_memory, indent=4)
|
||||
history = []
|
||||
history.append(GPT_SETTINGS[0])
|
||||
chat_gpt_config_request_size = num_tokens_from_string(GPT_SETTINGS[0], "gpt-4")
|
||||
# --- tryb NONE: nie dotykamy pamięci i pozwalamy przekazać własny 'none_request' ---
|
||||
if isinstance(none_request, list):
|
||||
history_msgs = none_request
|
||||
elif isinstance(none_request, str) and none_request.strip():
|
||||
history_msgs = [{"role": "user", "content": none_request}]
|
||||
else:
|
||||
history_msgs = [{"role": "user", "content": f"{username}:{prompt}"}]
|
||||
|
||||
for slowo, reakcja in WORD_REACTIONS.items():
|
||||
if not reakcja[3]:
|
||||
content = (
|
||||
"Kiedy słyszysz "
|
||||
+ slowo
|
||||
+ " to reagujesz lub dzieje się to "
|
||||
+ reakcja[0]
|
||||
)
|
||||
temp = {"role": "system", "content": content}
|
||||
chat_gpt_config_request_size += num_tokens_from_string(temp, "gpt-4")
|
||||
history.append(temp)
|
||||
logger.info("Rozmiar zapytania (tok): %s", "n/a") # tokeny już policzone wyżej
|
||||
|
||||
final_prompt = username + ":" + prompt
|
||||
logger.debug(
|
||||
"Rozmiar zapytania przed dodaniem historii %s", chat_gpt_config_request_size
|
||||
)
|
||||
if request_type == "MUSIC":
|
||||
algorithm = "gpt-4o"
|
||||
table = MESSAGE_TABLE_MUZYKA
|
||||
token_amount = 10700
|
||||
elif request_type == "RANDOM":
|
||||
algorithm = "gpt-4o"
|
||||
table = MESSAGE_TABLE
|
||||
token_amount = 10700
|
||||
else:
|
||||
table = MESSAGE_TABLE
|
||||
algorithm = "gpt-4o"
|
||||
token_amount = 10700
|
||||
|
||||
prompt_gpt_request_size = num_tokens_from_string(
|
||||
{"role": "user", "content": final_prompt}, "gpt-4"
|
||||
)
|
||||
temptable = []
|
||||
for i in reversed(table):
|
||||
temp_token = num_tokens_from_string(i, "gpt-4")
|
||||
logger.debug(
|
||||
"Rozmiar zapytania %s prompt %s temp %s",
|
||||
chat_gpt_config_request_size,
|
||||
prompt_gpt_request_size,
|
||||
temp_token,
|
||||
)
|
||||
if (
|
||||
chat_gpt_config_request_size
|
||||
< token_amount + prompt_gpt_request_size + temp_token
|
||||
):
|
||||
temptable.insert(1, i)
|
||||
chat_gpt_config_request_size += temp_token
|
||||
history.extend(temptable)
|
||||
temp = {"role": "user", "content": final_prompt}
|
||||
history.append(temp)
|
||||
logger.info("Rozmiar zapytania po wyslaniu %s", chat_gpt_config_request_size)
|
||||
try:
|
||||
response = await OPENAICLIENT.chat.completions.create(
|
||||
model=algorithm, messages=history
|
||||
# ...przygotowanie messages/system prompt/itp. jak masz...
|
||||
# retry/backoff + deadline (zachowuje Twoją semantykę logowania)
|
||||
timeout_sec = 120
|
||||
deadline = time.time() + timeout_sec
|
||||
response = await asyncio.wait_for(
|
||||
openai_call(messages=history_msgs, model=model_to_use),
|
||||
timeout=max(0.1, deadline - time.time()),
|
||||
)
|
||||
|
||||
except openai.APITimeoutError as e:
|
||||
# Handle timeout error, e.g. retry or log
|
||||
result = f"*Kondziu patrzy na terminal, czeka, czeka, czeka,.... Jeszcze chwile czeka Przypierdala w niego pięścią....* Nie mogę się połączyć z Openai spróbuj od nowa. *Na ekranie pojawia się*: {e}"
|
||||
response = f"*Kondziu patrzy na terminal, czeka, czeka, czeka,.... Jeszcze chwile czeka Przypierdala w niego pięścią....* Nie mogę się połączyć z Openai spróbuj od nowa. *Na ekranie pojawia się*: {e}"
|
||||
except openai.APIConnectionError as e:
|
||||
result = f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Nie mogę się połączyć z Openai. *Na ekranie pojawia się*: {e}"
|
||||
response = f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Nie mogę się połączyć z Openai. *Na ekranie pojawia się*: {e}"
|
||||
except openai.BadRequestError as e:
|
||||
# Handle invalid request error, e.g. validate parameters or log
|
||||
resp, _ = await handle_response(
|
||||
f"Wytlumacz jakie sa zasady dotyczące treści które możesz generować używając Dalle. Wytłumacz błąd {e} prostym językiem. Przeproś za nadmierną cenzurę. Wytłumacz co mogło być nie tak w prompcie 'prompt'",
|
||||
True,
|
||||
True,
|
||||
MESSAGE_TABLE,
|
||||
username,
|
||||
"RANDOM",
|
||||
)
|
||||
result = f"Sorki, cenzura: {resp}. Jak chcesz to są kanały na nudle #sexy-foteczky i #kanal-do-fapania *Na ekranie pojawia się: {e}"
|
||||
if internal_retry:
|
||||
resp = "Nie umiem tego teraz ładnie wytłumaczyć — OpenAI mnie zastrzeliło."
|
||||
else:
|
||||
resp, _ = await handle_response(
|
||||
|
||||
f"Wytlumacz jakie sa zasady dotyczące treści które możesz generować używając Dalle. Wytłumacz błąd {e} prostym językiem. Przeproś za nadmierną cenzurę. Wytłumacz co mogło być nie tak w prompcie 'prompt'",
|
||||
True,
|
||||
True,
|
||||
MESSAGE_TABLE,
|
||||
username,
|
||||
"RANDOM",
|
||||
)
|
||||
response = f"Sorki, cenzura: {resp}. Jak chcesz to są kanały na nudle #sexy-foteczky i #kanal-do-fapania *Na ekranie pojawia się: {e}"
|
||||
except openai.APIResponseValidationError as e:
|
||||
# Handle invalid request error, e.g. validate parameters or log
|
||||
resp, _ = await handle_response(
|
||||
f"Wytlumacz jakie sa zasady dotyczące treści które możesz generować używając Dalle. Wytłumacz błąd {e} prostym językiem. Przeproś za nadmierną cenzurę. Wytłumacz co mogło być nie tak w prompcie 'prompt'",
|
||||
True,
|
||||
True,
|
||||
MESSAGE_TABLE,
|
||||
username,
|
||||
"RANDOM",
|
||||
)
|
||||
result = f"Sorki, cenzura: {resp}. Jak chcesz to są kanały na nudle #sexy-foteczky i #kanal-do-fapania *Na ekranie pojawia się: {e}"
|
||||
if internal_retry:
|
||||
resp = "Nie umiem tego teraz ładnie wytłumaczyć — OpenAI mnie zastrzeliło."
|
||||
else:
|
||||
resp, _ = await handle_response(
|
||||
f"Wytlumacz jakie sa zasady dotyczące treści które możesz generować używając Dalle. Wytłumacz błąd {e} prostym językiem. Przeproś za nadmierną cenzurę. Wytłumacz co mogło być nie tak w prompcie 'prompt'",
|
||||
True,
|
||||
True,
|
||||
MESSAGE_TABLE,
|
||||
username,
|
||||
"RANDOM",
|
||||
)
|
||||
response = f"Sorki, cenzura: {resp}. Jak chcesz to są kanały na nudle #sexy-foteczky i #kanal-do-fapania *Na ekranie pojawia się: {e}"
|
||||
except openai.AuthenticationError as e:
|
||||
# Handle authentication error, e.g. check credentials or log
|
||||
result = f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Wołaj szefa - coś się z hasłem zjebało. *Na terminalu pojawia się:* {e}"
|
||||
response = f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Wołaj szefa - coś się z hasłem zjebało. *Na terminalu pojawia się:* {e}"
|
||||
except openai.PermissionDeniedError as e:
|
||||
# Handle permission error, e.g. check scope or log
|
||||
result = f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Wołaj szefa - coś się z uprawnieniami zjebało. *Na terminalu pojawia się:* {e}"
|
||||
response = f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Wołaj szefa - coś się z uprawnieniami zjebało. *Na terminalu pojawia się:* {e}"
|
||||
except openai.RateLimitError as e:
|
||||
result = f"*Kondziu patrzy na terminal* Wołaj szefa. Zapłacić rachunki za AI trzeba. Jak chcesz to się na #zebranie dorzuć. {e}"
|
||||
response = f"*Kondziu patrzy na terminal* Wołaj szefa. Zapłacić rachunki za AI trzeba. Jak chcesz to się na #zebranie dorzuć. {e}"
|
||||
except openai.UnprocessableEntityError as e:
|
||||
result = f"*Kondziu patrzy na terminal. Potem na to co każesz mu wysłać....* Ja wiem że jesteśmy w barze BDSM - ale nie da się włożyć TEGO w TO. *Za jego plecami na terminalu pojawia się:* {e}"
|
||||
response = f"*Kondziu patrzy na terminal. Potem na to co każesz mu wysłać....* Ja wiem że jesteśmy w barze BDSM - ale nie da się włożyć TEGO w TO. *Za jego plecami na terminalu pojawia się:* {e}"
|
||||
except openai.APIError as e:
|
||||
# Handle API error, e.g. retry or log
|
||||
result = f"*Kondziu nurkuje za bar, terminal wybucha. Przed tobą ląduje pergamin zapisany pięknym gotykiem a na nim*: {e}"
|
||||
response = f"*Kondziu nurkuje za bar, terminal wybucha. Przed tobą ląduje pergamin zapisany pięknym gotykiem a na nim*: {e}"
|
||||
|
||||
logger.info("Historia wysłana:")
|
||||
logger.info(history)
|
||||
await asyncio.sleep(15)
|
||||
result = ""
|
||||
logger.debug("Odpowiedzi")
|
||||
logger.info(response)
|
||||
logger.debug(response.choices)
|
||||
for choice in response.choices:
|
||||
result += choice.message.content
|
||||
logger.info("Sformatowane odpowiedzi")
|
||||
logger.info(result)
|
||||
temp = {"role": "assistant", "content": result}
|
||||
history.append(temp)
|
||||
temp_assistant = {"role": "assistant", "content": response}
|
||||
logger.info(temp_assistant)
|
||||
if request_type == "MUSIC":
|
||||
with open(MEMORY_FIVE_MUZYKA, "r+", encoding=ENCODING) as file_music_memory:
|
||||
# First we load existing data into a dict.
|
||||
file_data = json.load(file_music_memory)
|
||||
# Join new_data with file_data inside emp_details
|
||||
file_data.append(temp)
|
||||
file_music_memory.seek(0)
|
||||
# convert back to json.
|
||||
json.dump(file_data, file_music_memory, indent=4)
|
||||
elif request_type == "RANDOM":
|
||||
with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as file_memory:
|
||||
# First we load existing data into a dict.
|
||||
file_data = json.load(file_memory)
|
||||
# Join new_data with file_data inside emp_details
|
||||
file_data.append(temp)
|
||||
file_memory.seek(0)
|
||||
# convert back to json.
|
||||
json.dump(file_data, file_memory, indent=4)
|
||||
else:
|
||||
with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as file_memory:
|
||||
# First we load existing data into a dict.
|
||||
file_data = json.load(file_memory)
|
||||
# Join new_data with file_data inside emp_details
|
||||
file_data.append(temp)
|
||||
file_memory.seek(0)
|
||||
# convert back to json.
|
||||
json.dump(file_data, file_memory, indent=4)
|
||||
return result, MESSAGE_TABLE
|
||||
# zapis do pliku MUZYKA
|
||||
with open(MEMORY_FIVE_MUZYKA, "r+", encoding=ENCODING) as fh:
|
||||
file_data = json.load(fh)
|
||||
file_data.append({"role": "user", "content": f"{username}:{prompt}"})
|
||||
file_data.append(temp_assistant)
|
||||
fh.seek(0)
|
||||
json.dump(file_data, fh, indent=4)
|
||||
return response, MESSAGE_TABLE_MUZYKA
|
||||
|
||||
elif request_type in ("RANDOM", "GENERAL"):
|
||||
with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as fh:
|
||||
file_data = json.load(fh)
|
||||
file_data.append({"role": "user", "content": f"{username}:{prompt}"})
|
||||
file_data.append(temp_assistant)
|
||||
fh.seek(0)
|
||||
json.dump(file_data, fh, indent=4)
|
||||
return response, MESSAGE_TABLE
|
||||
|
||||
else: # NONE
|
||||
return response, []
|
||||
|
||||
|
||||
async def get_random_cyclic_message(client):
|
||||
@@ -395,7 +436,7 @@ async def chat_with_assistant(message, assistant_name):
|
||||
logger.info(block.text.value)
|
||||
chat_response += block.text.value
|
||||
await discord_friendly_send(message.channel, chat_response)
|
||||
#await message.channel.send(chat_response)
|
||||
# await message.channel.send(chat_response)
|
||||
done = True
|
||||
elif run.status == "cancelled":
|
||||
await discord_friendly_send(message.channel, "Cos sie wywaliło")
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
],
|
||||
[
|
||||
"compress_release5",
|
||||
170.0
|
||||
120.0
|
||||
],
|
||||
[
|
||||
"compress_attack5",
|
||||
@@ -69,7 +69,7 @@
|
||||
],
|
||||
[
|
||||
"compress_release4",
|
||||
180.0
|
||||
130.0
|
||||
],
|
||||
[
|
||||
"compress_attack4",
|
||||
@@ -81,7 +81,7 @@
|
||||
],
|
||||
[
|
||||
"compress_gain3",
|
||||
8.2
|
||||
5.5
|
||||
],
|
||||
[
|
||||
"compress_ratio3",
|
||||
@@ -93,7 +93,7 @@
|
||||
],
|
||||
[
|
||||
"compress_release3",
|
||||
180.0
|
||||
140.0
|
||||
],
|
||||
[
|
||||
"compress_attack3",
|
||||
@@ -105,7 +105,7 @@
|
||||
],
|
||||
[
|
||||
"compress_gain2",
|
||||
7.4
|
||||
3.3
|
||||
],
|
||||
[
|
||||
"compress_ratio2",
|
||||
@@ -117,7 +117,7 @@
|
||||
],
|
||||
[
|
||||
"compress_release2",
|
||||
190.0
|
||||
120.0
|
||||
],
|
||||
[
|
||||
"compress_attack2",
|
||||
@@ -129,7 +129,7 @@
|
||||
],
|
||||
[
|
||||
"compress_gain1",
|
||||
11.1
|
||||
5.6
|
||||
],
|
||||
[
|
||||
"compress_ratio1",
|
||||
@@ -137,11 +137,11 @@
|
||||
],
|
||||
[
|
||||
"compress_threshold1",
|
||||
-12.7
|
||||
-12.2
|
||||
],
|
||||
[
|
||||
"compress_release1",
|
||||
170.0
|
||||
120.0
|
||||
],
|
||||
[
|
||||
"compress_attack1",
|
||||
@@ -153,7 +153,7 @@
|
||||
],
|
||||
[
|
||||
"compress_gain0",
|
||||
16.0
|
||||
7.5
|
||||
],
|
||||
[
|
||||
"compress_ratio0",
|
||||
@@ -161,15 +161,15 @@
|
||||
],
|
||||
[
|
||||
"compress_threshold0",
|
||||
-15.3
|
||||
-13.1
|
||||
],
|
||||
[
|
||||
"compress_release0",
|
||||
200.0
|
||||
110.0
|
||||
],
|
||||
[
|
||||
"compress_attack0",
|
||||
90.0
|
||||
140.0
|
||||
],
|
||||
[
|
||||
"compress_frequency0",
|
||||
@@ -185,11 +185,11 @@
|
||||
],
|
||||
[
|
||||
"g",
|
||||
9.5
|
||||
1.0
|
||||
],
|
||||
[
|
||||
"f",
|
||||
64.2
|
||||
106.4
|
||||
]
|
||||
]
|
||||
}
|
||||
@@ -140,3 +140,16 @@ with open(MEMORY_FIVE_MUZYKA, "r+", encoding=ENCODING) as temp_music_memory_file
|
||||
MESSAGE_TABLE_MUZYKA = json.load(temp_music_memory_file)
|
||||
SPECJALNE_ZIEMNIACZKI = GPT_SETTINGS[1]
|
||||
ASSISTANTS = {}
|
||||
|
||||
|
||||
LATEX_TEX_ENGINE = "tectonic"
|
||||
LATEX_MAX_COMPILE_SECONDS = 45
|
||||
LATEX_MAX_ATTACH_MB = 8
|
||||
LATEX_MAX_ZIP_MB = 25
|
||||
|
||||
OPENAI_MODEL = "gpt-4o-mini"
|
||||
|
||||
ALLOWED_ROLES = ["Nocna Zmiana", "Jarl", "Thane", "Bartender"]
|
||||
GUILD_ID = 664789470779932693
|
||||
LATEST_MODEL = "gpt-4o" # najnowszy/do rozmów (możesz zmienić w jednym miejscu)
|
||||
CHEAP_MODEL = "gpt-4o-mini" # najtańszy (fallback do 3.5 niżej)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
total_commands=26
|
||||
total_commands=29
|
||||
current_command=0
|
||||
|
||||
function print_progress {
|
||||
@@ -86,6 +86,14 @@ print_progress "cp ./conjurer/file_search_functions.py ./Conjurer/"
|
||||
cp ./conjurer/file_search_commands.py ./Conjurer
|
||||
print_progress "cp ./conjurer/file_search_functions.py ./Conjurer/"
|
||||
|
||||
cp ./conjurer/latex_commands.py ./Conjurer/
|
||||
print_progress "cp ./conjurer/latex_commands.py ./Conjurer/"
|
||||
|
||||
cp ./conjurer/latex_functions.py ./Conjurer/
|
||||
print_progress "cp ./conjurer/latex_functions.py ./Conjurer/"
|
||||
|
||||
cp ./conjurer/librarian_functions.py ./Conjurer
|
||||
print_progress "cp ./conjurer/librarian_functions.py ./Conjurer/"
|
||||
|
||||
cp ./conjurer/thin_client.py ./Conjurer/bot.py
|
||||
print_progress "cp ./conjurer/thin_client.py ./Conjurer/bot.py"
|
||||
|
||||
Executable
+141
@@ -0,0 +1,141 @@
|
||||
#!/usr/bin/env bash
|
||||
# System-wide install & verify (Debian/RPi):
|
||||
# - EB Garamond (APT)
|
||||
# - Cinzel Decorative Black (RAW TTF)
|
||||
# - IM Fell English SC (gstatic/RAW)
|
||||
# No TeX build here. Very verbose + clear final report.
|
||||
|
||||
set -Eeuo pipefail
|
||||
|
||||
SUDO=sudo; [ "$(id -u)" -eq 0 ] && SUDO=
|
||||
log(){ echo -e "[+] $*"; }
|
||||
warn(){ echo -e "[WARN] $*" >&2; }
|
||||
die(){ echo -e "[FATAL] $*" >&2; exit 1; }
|
||||
|
||||
need(){ command -v "$1" >/dev/null 2>&1 || die "Missing tool: $1"; }
|
||||
fetch(){
|
||||
local url="$1" out="$2"
|
||||
if command -v wget >/dev/null 2>&1; then
|
||||
log "wget -> $url"
|
||||
wget -O "$out" --https-only --no-verbose "$url"
|
||||
else
|
||||
log "curl -> $url"
|
||||
curl -L --fail --show-error --output "$out" "$url"
|
||||
fi
|
||||
}
|
||||
|
||||
# ---- detection using fc-list families (robust, no PCRE) ----
|
||||
fc_families_lower() {
|
||||
fc-list -f '%{family}\n' \
|
||||
| tr ',' '\n' \
|
||||
| sed 's/^[[:space:]]*//; s/[[:space:]]*$//' \
|
||||
| tr '[:upper:]' '[:lower:]' \
|
||||
| sort -u
|
||||
}
|
||||
has_family_re() { # $1 = POSIX ERE anchored-at-start pattern (lowercase)
|
||||
fc_families_lower | grep -Eiq "$1"
|
||||
}
|
||||
|
||||
# ---- prereqs ----
|
||||
for t in fc-cache fc-list grep sed awk; do need "$t"; done
|
||||
command- v wget >/dev/null 2>&1 || command -v curl >/dev/null 2>&1 || die "Need wget or curl"
|
||||
|
||||
SYSTEM_DIR="/usr/local/share/fonts/dj"
|
||||
DIR_CINZEL="$SYSTEM_DIR/cinzel-decorative"
|
||||
DIR_IMFELL="$SYSTEM_DIR/im-fell-english-sc"
|
||||
$SUDO mkdir -p "$DIR_CINZEL" "$DIR_IMFELL"
|
||||
|
||||
echo "=== APT phase (EB Garamond) ==="
|
||||
if command -v apt-get >/dev/null 2>&1; then
|
||||
$SUDO apt-get update -y || warn "apt update failed (continuing)"
|
||||
if $SUDO apt-get install -y --no-install-recommends fonts-ebgaramond; then
|
||||
log "installed: fonts-ebgaramond"
|
||||
else
|
||||
warn "apt install failed: fonts-ebgaramond"
|
||||
fi
|
||||
else
|
||||
warn "apt-get not found — skipping"
|
||||
fi
|
||||
|
||||
echo
|
||||
log "Families BEFORE web fallback (sample grep):"
|
||||
fc-list | grep -Ei "Garamond|Cinzel|Fell" || echo " (none)"
|
||||
|
||||
echo
|
||||
echo "=== Web fallback (system-wide to $SYSTEM_DIR) ==="
|
||||
|
||||
# --- Cinzel Decorative Black ---
|
||||
CINZEL_TTF="$DIR_CINZEL/CinzelDecorative-Black.ttf"
|
||||
if ! has_family_re '^cinzel decorative( |$)'; then
|
||||
fetch "https://github.com/google/fonts/raw/main/ofl/cinzeldecorative/CinzelDecorative-Black.ttf" "$CINZEL_TTF" || warn "Cinzel Decorative Black download failed"
|
||||
[ -s "$CINZEL_TTF" ] && $SUDO chmod 0644 "$CINZEL_TTF"
|
||||
else
|
||||
log "Cinzel Decorative already present."
|
||||
fi
|
||||
|
||||
# --- IM Fell English SC ---
|
||||
IMFELL_TTF="$DIR_IMFELL/IMFeENsc.ttf"
|
||||
if ! has_family_re '^im fell english sc( |$)'; then
|
||||
# Try known gstatic TTFs (stable direct links)
|
||||
for u in \
|
||||
"https://fonts.gstatic.com/s/imfellenglishsc/v7/h3Tn6yWfw4b5qaLD1RWvz5ATixNthKRRR1XVH3rJNiw.ttf" \
|
||||
"https://fonts.gstatic.com/s/imfellenglishsc/v6/h3Tn6yWfw4b5qaLD1RWvz5ATixNthKRRR1XVH3rJNiw.ttf"
|
||||
do
|
||||
if fetch "$u" "$IMFELL_TTF"; then
|
||||
[ -s "$IMFELL_TTF" ] && { $SUDO chmod 0644 "$IMFELL_TTF"; log "IM Fell SC from gstatic OK"; break; }
|
||||
fi
|
||||
done
|
||||
# Secondary RAW in google/fonts (names changed over time)
|
||||
if [ ! -s "$IMFELL_TTF" ]; then
|
||||
for u in \
|
||||
"https://github.com/google/fonts/raw/main/ofl/imfellenglishsc/IMFeENsc28P.ttf" \
|
||||
"https://github.com/google/fonts/raw/main/ofl/imfellenglishsc/IMFellEnglishSC-Regular.ttf"
|
||||
do
|
||||
if fetch "$u" "$IMFELL_TTF"; then
|
||||
[ -s "$IMFELL_TTF" ] && { $SUDO chmod 0644 "$IMFELL_TTF"; log "IM Fell SC from google/fonts RAW OK"; break; }
|
||||
fi
|
||||
done
|
||||
fi
|
||||
# Minimal mirror fallback (only if naprawdę trzeba)
|
||||
if [ ! -s "$IMFELL_TTF" ]; then
|
||||
for u in \
|
||||
"https://www.wfonts.com/download/data/2016/06/14/im-fell-english-sc/IMFeENsc28P.ttf" \
|
||||
"https://www.1001freefonts.com/d/6800/IMFeENsc28P.ttf"
|
||||
do
|
||||
fetch "$u" "$IMFELL_TTF" || true
|
||||
[ -s "$IMFELL_TTF" ] && { $SUDO chmod 0644 "$IMFELL_TTF"; log "IM Fell SC from mirror OK"; break; }
|
||||
done
|
||||
fi
|
||||
[ -s "$IMFELL_TTF" ] || warn "IM Fell English SC still missing."
|
||||
else
|
||||
log "IM Fell English SC already present."
|
||||
fi
|
||||
|
||||
echo
|
||||
log "Fix perms & rebuild cache..."
|
||||
$SUDO find "$SYSTEM_DIR" -type f -size 0 -print -delete || true
|
||||
$SUDO find "$SYSTEM_DIR" -type f \( -name "*.ttf" -o -name "*.otf" \) -exec chmod 0644 {} \; || true
|
||||
$SUDO find "$SYSTEM_DIR" -type d -exec chmod 0755 {} \; || true
|
||||
$SUDO fc-cache -f -v >/dev/null || warn "fc-cache returned non-zero"
|
||||
|
||||
# ---- FINAL REPORT ----
|
||||
echo
|
||||
log "FINAL STATUS (fc-list families & file presence)"
|
||||
families="$(fc_families_lower)"
|
||||
|
||||
report(){
|
||||
local label="$1" fam_re="$2" file_hint="$3"
|
||||
local fam_ok file_ok="n/a"
|
||||
if echo "$families" | grep -Eiq "$fam_re"; then fam_ok="OK"; else fam_ok="MISSING"; fi
|
||||
if [ -n "$file_hint" ]; then
|
||||
if [ -s "$file_hint" ]; then file_ok="yes"; else file_ok="no"; fi
|
||||
fi
|
||||
printf " %-22s : families=%-8s file=%-3s (%s)\n" "$label" "$fam_ok" "$file_ok" "${file_hint:-no-file-hint}"
|
||||
}
|
||||
|
||||
report "EB Garamond" '^eb garamond( |$)' "" # from APT
|
||||
report "Cinzel Decorative" '^cinzel decorative( |$)' "$CINZEL_TTF"
|
||||
report "IM Fell English SC" '^im fell english sc( |$)' "$IMFELL_TTF"
|
||||
|
||||
echo
|
||||
log "Done. (Run your LaTeX pipeline next.)"
|
||||
+98
@@ -0,0 +1,98 @@
|
||||
#!/usr/bin/env bash
|
||||
# "apt dla fontów": Google Fonts ZIP → GitHub (ofl RAW) → fonts.gstatic.com → mirrory.
|
||||
# System-wide install do /usr/local/share/fonts/fontget/<rodzina> + fc-cache.
|
||||
# Usage: sudo ./fontget.sh "IM Fell English SC" "Cinzel Decorative" "EB Garamond"
|
||||
|
||||
set -Eeuo pipefail
|
||||
SUDO=sudo; [ "$(id -u)" -eq 0 ] && SUDO=
|
||||
log(){ echo -e "[+] $*"; }
|
||||
warn(){ echo -e "[WARN] $*" >&2; }
|
||||
die(){ echo -e "[FATAL] $*" >&2; exit 1; }
|
||||
|
||||
need(){ command -v "$1" >/dev/null 2>&1 || die "Missing: $1"; }
|
||||
need fc-cache
|
||||
command -v wget >/dev/null 2>&1 || command -v curl >/dev/null 2>&1 || die "Need wget/curl"
|
||||
command -v unzip >/dev/null 2>&1 || warn "unzip missing — ZIP installs limited"
|
||||
command -v file >/dev/null 2>&1 || warn "file missing — MIME checks limited"
|
||||
command -v fc-list >/dev/null 2>&1 || die "Missing: fc-list"
|
||||
|
||||
fetch(){ local u="$1" o="$2"; if command -v wget >/dev/null 2>&1; then wget -O "$o" --https-only --no-verbose "$u"; else curl -L --fail --show-error --output "$o" "$u"; fi; }
|
||||
slug(){ echo "$1" | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9]+/-/g; s/^-+|-+$//g'; }
|
||||
present(){ fc-list -f '%{family}\n' | tr ',' '\n' | sed 's/^[[:space:]]*//; s/[[:space:]]*$//' | tr '[:upper:]' '[:lower:]' | sort -u | grep -Eiq "$1"; }
|
||||
|
||||
install_dir="/usr/local/share/fonts/fontget"; $SUDO mkdir -p "$install_dir"
|
||||
|
||||
is_zip(){ command -v file >/dev/null 2>&1 && file "$1" | grep -qi zip; }
|
||||
gf_zip_try(){
|
||||
local name="$1" outdir="$2" enc zip
|
||||
enc="$(python3 - <<PY
|
||||
import urllib.parse,sys
|
||||
print(urllib.parse.quote(sys.argv[1]))
|
||||
PY
|
||||
"$name")" || enc="$(echo "$name" | sed 's/ /%20/g')"
|
||||
zip="$(mktemp /tmp/fontget.XXXXXX.zip)"
|
||||
if fetch "https://fonts.google.com/download?family=${enc}" "$zip"; then
|
||||
if is_zip "$zip"; then $SUDO mkdir -p "$outdir"; $SUDO unzip -o -q "$zip" -d "$outdir" || true; rm -f "$zip"; return 0; fi
|
||||
fi
|
||||
rm -f "$zip" || true; return 1
|
||||
}
|
||||
gh_ofl_try(){
|
||||
local family="$1" outdir="$2" html
|
||||
html="$(mktemp /tmp/ofl.$(slug "$family").html)"
|
||||
if fetch "https://github.com/google/fonts/tree/main/ofl/$(slug "$family")" "$html"; then
|
||||
mapfile -t paths < <(grep -Eo '/google/fonts/blob/main/ofl/'"$(slug "$family")"'/[^"]+\.(ttf|otf)' "$html" | sed 's|/blob/|/raw/|g' | sort -u)
|
||||
[ "${#paths[@]}" -gt 0 ] || { rm -f "$html"; return 1; }
|
||||
$SUDO mkdir -p "$outdir"
|
||||
for p in "${paths[@]}"; do fetch "https://github.com$p" "$outdir/$(basename "$p")" || true; done
|
||||
rm -f "$html"; return 0
|
||||
fi
|
||||
rm -f "$html"; return 1
|
||||
}
|
||||
gstatic_try(){ local out="$2"; shift 2; for u in "$@"; do fetch "$u" "$out" && [ -s "$out" ] && return 0; done; return 1; }
|
||||
|
||||
report(){ local label="$1" re="$2"; if present "$re"; then printf "RESULT: %-24s : OK\n" "$label"; else printf "RESULT: %-24s : FAIL\n" "$label"; fi }
|
||||
|
||||
if [ $# -lt 1 ]; then echo "Usage: $0 <Font Family> [Another ...]"; exit 1; fi
|
||||
|
||||
for family in "$@"; do
|
||||
echo; log "=== $family ==="
|
||||
fam_slug="$(slug "$family")"
|
||||
outdir="$install_dir/$fam_slug"
|
||||
$SUDO mkdir -p "$outdir"
|
||||
|
||||
case "$fam_slug" in
|
||||
cinzel-decorative|cinzel|cinzel-decorative-black)
|
||||
fetch "https://github.com/google/fonts/raw/main/ofl/cinzeldecorative/CinzelDecorative-Black.ttf" "$outdir/CinzelDecorative-Black.ttf" || warn "Cinzel fetch failed"
|
||||
;;
|
||||
im-fell-english-sc)
|
||||
gstatic_try "$fam_slug" "$outdir/IMFeENsc.ttf" \
|
||||
"https://fonts.gstatic.com/s/imfellenglishsc/v7/h3Tn6yWfw4b5qaLD1RWvz5ATixNthKRRR1XVH3rJNiw.ttf" \
|
||||
"https://fonts.gstatic.com/s/imfellenglishsc/v6/h3Tn6yWfw4b5qaLD1RWvz5ATixNthKRRR1XVH3rJNiw.ttf" \
|
||||
|| { fetch "https://github.com/google/fonts/raw/main/ofl/imfellenglishsc/IMFeENsc28P.ttf" "$outdir/IMFeENsc.ttf" || true
|
||||
[ -s "$outdir/IMFeENsc.ttf" ] || fetch "https://github.com/google/fonts/raw/main/ofl/imfellenglishsc/IMFellEnglishSC-Regular.ttf" "$outdir/IMFeENsc.ttf" || true
|
||||
[ -s "$outdir/IMFeENsc.ttf" ] || fetch "https://www.wfonts.com/download/data/2016/06/14/im-fell-english-sc/IMFeENsc28P.ttf" "$outdir/IMFeENsc.ttf" || true
|
||||
[ -s "$outdir/IMFeENsc.ttf" ] || fetch "https://www.1001freefonts.com/d/6800/IMFeENsc28P.ttf" "$outdir/IMFeENsc.ttf" || true; }
|
||||
;;
|
||||
eb-garamond|ebgaramond)
|
||||
# Najpierw apt (jeśli chcesz: sudo apt install fonts-ebgaramond), tu tylko web:
|
||||
gf_zip_try "$family" "$outdir" || gh_ofl_try "$family" "$outdir" || true
|
||||
;;
|
||||
*)
|
||||
gf_zip_try "$family" "$outdir" || gh_ofl_try "$family" "$outdir" || true
|
||||
;;
|
||||
esac
|
||||
|
||||
$SUDO find "$outdir" -type f -size 0 -print -delete || true
|
||||
$SUDO find "$outdir" -type f \( -name "*.ttf" -o -name "*.otf" \) -exec chmod 0644 {} \; || true
|
||||
$SUDO find "$outdir" -type d -exec chmod 0755 {} \; || true
|
||||
$SUDO fc-cache -f -v >/dev/null || true
|
||||
|
||||
case "$fam_slug" in
|
||||
cinzel* ) report "Cinzel Decorative" '^cinzel decorative( |$)' ;;
|
||||
im-fell-english-sc ) report "IM Fell English SC" '^im fell english sc( |$)' ;;
|
||||
eb-garamond* ) report "EB Garamond" '^eb garamond( |$)' ;;
|
||||
* ) report "$family" "$(echo "$family" | tr '[:upper:]' '[:lower:]' | sed 's/ /.* /g')" ;;
|
||||
esac
|
||||
done
|
||||
|
||||
echo; log "All done."
|
||||
Binary file not shown.
@@ -0,0 +1,14 @@
|
||||
from flask import Flask
|
||||
from file_serv import bp as uploader_bp
|
||||
from ingest import bp as ingest_bp
|
||||
from waitress import serve
|
||||
|
||||
app = Flask(__name__)
|
||||
HOST_ADDRESS = "127.0.0.1"
|
||||
PORT_ADDRESS = 49151
|
||||
|
||||
if __name__ == "__main__":
|
||||
app.register_blueprint(uploader_bp, url_prefix="/api")
|
||||
app.register_blueprint(ingest_bp, url_prefix="/api")
|
||||
|
||||
serve(app, host=HOST_ADDRESS, port=PORT_ADDRESS)
|
||||
@@ -0,0 +1,155 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import annotations
|
||||
import os
|
||||
from pathlib import Path
|
||||
from typing import List, Dict, Any, Optional
|
||||
|
||||
from flask import Blueprint, request, jsonify, send_file, abort, current_app
|
||||
from werkzeug.utils import secure_filename
|
||||
|
||||
# ===== Konfiguracja przez ENV =====
|
||||
|
||||
if API_KEY := os.getenv("API_KEY") is None:
|
||||
with open("/home/pi/gpt_cont_api_key", "r") as f:
|
||||
API_KEY = f.read().strip()
|
||||
else:
|
||||
API_KEY = os.getenv("API_KEY", "") # np. openssl rand -hex 32
|
||||
|
||||
UPLOAD_DIR = Path(os.getenv("UPLOAD_DIR", "/home/pi/tmp_git/")) # katalog na dysku
|
||||
MAX_CONTENT_MB = int(os.getenv("MAX_CONTENT_MB", "200"))
|
||||
|
||||
# Google Drive (opcjonalnie)
|
||||
GDRIVE_ENABLE = os.getenv("GDRIVE_ENABLE", "0") == "1"
|
||||
GDRIVE_SA_JSON = os.getenv("GDRIVE_SA_JSON", "") # ścieżka do pliku .json konta serwisowego
|
||||
GDRIVE_FOLDER_ID = os.getenv("GDRIVE_FOLDER_ID", "") # ID folderu na Drive
|
||||
|
||||
bp = Blueprint("uploader", __name__)
|
||||
|
||||
# Inicjalizacja katalogu
|
||||
UPLOAD_DIR.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
def _check_auth() -> bool:
|
||||
"""Proste Bearer auth. Jeśli API_KEY puste -> bez auth (niezalecane)."""
|
||||
if not API_KEY:
|
||||
return True
|
||||
auth = request.headers.get("Authorization", "")
|
||||
if auth.startswith("Bearer "):
|
||||
token = auth[7:].strip()
|
||||
return token == API_KEY
|
||||
return False
|
||||
|
||||
def _safe_join(base: Path, *parts: str) -> Path:
|
||||
"""Zapobiega ../ — wymusza pozostanie w katalogu bazowym."""
|
||||
p = (base.joinpath(*parts)).resolve()
|
||||
if not str(p).startswith(str(base.resolve())):
|
||||
abort(400, description="Invalid path")
|
||||
return p
|
||||
|
||||
# ===== Google Drive helper =====
|
||||
_drive_client_cached = None
|
||||
|
||||
def _get_drive():
|
||||
global _drive_client_cached
|
||||
if _drive_client_cached is not None:
|
||||
return _drive_client_cached
|
||||
|
||||
if not (GDRIVE_ENABLE and GDRIVE_SA_JSON and os.path.exists(GDRIVE_SA_JSON)):
|
||||
return None
|
||||
|
||||
from google.oauth2 import service_account
|
||||
from googleapiclient.discovery import build
|
||||
|
||||
scopes = ["https://www.googleapis.com/auth/drive.file"]
|
||||
creds = service_account.Credentials.from_service_account_file(GDRIVE_SA_JSON, scopes=scopes)
|
||||
_drive_client_cached = build("drive", "v3", credentials=creds, cache_discovery=False)
|
||||
return _drive_client_cached
|
||||
|
||||
def upload_to_drive(local_path: Path, filename: str) -> Optional[Dict[str, Any]]:
|
||||
drv = _get_drive()
|
||||
if drv is None:
|
||||
return None
|
||||
from googleapiclient.http import MediaFileUpload
|
||||
file_metadata = {"name": filename}
|
||||
if GDRIVE_FOLDER_ID:
|
||||
file_metadata["parents"] = [GDRIVE_FOLDER_ID]
|
||||
media = MediaFileUpload(str(local_path), resumable=False)
|
||||
created = drv.files().create(body=file_metadata, media_body=media, fields="id,webViewLink,webContentLink").execute()
|
||||
file_id = created.get("id")
|
||||
# Przydatne linki:
|
||||
return {
|
||||
"file_id": file_id,
|
||||
"webViewLink": created.get("webViewLink"),
|
||||
"webContentLink": created.get("webContentLink"),
|
||||
"direct_view": f"https://drive.google.com/file/d/{file_id}/view",
|
||||
"direct_download": f"https://drive.google.com/uc?export=download&id={file_id}",
|
||||
}
|
||||
|
||||
@bp.get("/health")
|
||||
def health():
|
||||
return jsonify(ok=True, info="Okidokie")
|
||||
|
||||
@bp.post("/upload")
|
||||
def upload():
|
||||
"""Przyjmuje:
|
||||
- multipart/form-data z jednym plikiem ('file') lub wieloma ('files')
|
||||
- opcjonalnie: form 'subdir' (podkatalog), 'drive' (1/0) żeby wymusić wysyłkę na Drive
|
||||
"""
|
||||
if not _check_auth():
|
||||
return jsonify(error="Unauthorized"), 401
|
||||
|
||||
# Limit ciała żądania po stronie Flaska:
|
||||
request.max_content_length = MAX_CONTENT_MB * 1024 * 1024
|
||||
|
||||
files = []
|
||||
if "file" in request.files:
|
||||
files = [request.files["file"]]
|
||||
elif "files" in request.files:
|
||||
files = request.files.getlist("files")
|
||||
else:
|
||||
return jsonify(error="No file provided (use 'file' or 'files')"), 400
|
||||
|
||||
subdir = (request.form.get("subdir") or "").strip()
|
||||
target_dir = _safe_join(UPLOAD_DIR, subdir) if subdir else UPLOAD_DIR
|
||||
target_dir.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
want_drive = (request.form.get("drive") == "1") or (request.args.get("drive") == "1")
|
||||
saved: List[Dict[str, Any]] = []
|
||||
|
||||
for f in files:
|
||||
if not f or not f.filename:
|
||||
continue
|
||||
fname = secure_filename(f.filename)
|
||||
dest = _safe_join(target_dir, fname)
|
||||
f.save(dest)
|
||||
|
||||
item = {
|
||||
"filename": fname,
|
||||
"size": dest.stat().st_size,
|
||||
"path": str(dest.relative_to(UPLOAD_DIR)),
|
||||
"url_hint": f"/api/files/{dest.relative_to(UPLOAD_DIR)}",
|
||||
}
|
||||
|
||||
if want_drive and GDRIVE_ENABLE:
|
||||
try:
|
||||
gd = upload_to_drive(dest, fname)
|
||||
if gd:
|
||||
item["gdrive"] = gd
|
||||
except Exception as e:
|
||||
# log i idziemy dalej
|
||||
current_app.logger.exception("Drive upload failed: %s", e)
|
||||
item["gdrive_error"] = str(e)
|
||||
|
||||
saved.append(item)
|
||||
|
||||
if not saved:
|
||||
return jsonify(error="No valid files"), 400
|
||||
return jsonify(ok=True, saved=saved)
|
||||
|
||||
@bp.get("/files/<path:relpath>")
|
||||
def get_file(relpath: str):
|
||||
if not _check_auth():
|
||||
return jsonify(error="Unauthorized"), 401
|
||||
target = _safe_join(UPLOAD_DIR, relpath)
|
||||
if not target.exists() or not target.is_file():
|
||||
return jsonify(error="Not found"), 404
|
||||
return send_file(target, as_attachment=False)
|
||||
@@ -0,0 +1,52 @@
|
||||
# ingest_text.py
|
||||
import os
|
||||
import urllib.parse
|
||||
from pathlib import Path
|
||||
|
||||
from flask import Blueprint, abort, jsonify, request
|
||||
|
||||
bp = Blueprint("ingest_text", __name__)
|
||||
BASE = Path(os.getenv("INGEST_DIR", "/home/pi/tmp_git")).resolve()
|
||||
BASE.mkdir(parents=True, exist_ok=True)
|
||||
TOKEN = None
|
||||
with open("/home/pi/gpt_cont_api_key", "r") as f:
|
||||
TOKEN = f.read().strip()
|
||||
|
||||
|
||||
# prosty bufor kawałków w RAM (na 1 proces)
|
||||
chunks = {}
|
||||
|
||||
|
||||
@bp.get("/api/ingest-text")
|
||||
def ingest_text():
|
||||
if request.args.get("key") != TOKEN:
|
||||
return jsonify(error="unauthorized"), 401
|
||||
|
||||
name = request.args.get("name", "").strip()
|
||||
index = int(request.args.get("index", "1"))
|
||||
total = int(request.args.get("total", "1"))
|
||||
chunk = request.args.get("chunk", "")
|
||||
|
||||
if not name or "/" in name or ".." in name:
|
||||
return jsonify(error="bad name"), 400
|
||||
if not (1 <= index <= total <= 9999):
|
||||
return jsonify(error="bad indexing"), 400
|
||||
|
||||
# gromadzimy w pamięci (możesz podmienić na Redis)
|
||||
key = f"{name}:{total}"
|
||||
entry = chunks.setdefault(key, {})
|
||||
entry[index] = urllib.parse.unquote_plus(chunk)
|
||||
|
||||
if TOKEN is None:
|
||||
exit("No API token set!")
|
||||
if len(entry) == total:
|
||||
# składamy i zapisujemy
|
||||
data = "".join(entry[i] for i in range(1, total + 1))
|
||||
out = (BASE / name).resolve()
|
||||
if not str(out).startswith(str(BASE)):
|
||||
return jsonify(error="bad path"), 400
|
||||
out.write_text(data, encoding="utf-8")
|
||||
del chunks[key]
|
||||
return jsonify(ok=True, saved=str(out), bytes=len(data.encode("utf-8")))
|
||||
else:
|
||||
return jsonify(pending=True, got=len(entry), total=total)
|
||||
Executable
+2
@@ -0,0 +1,2 @@
|
||||
#!/bin/bash
|
||||
cd ../conjurer/ && git pull && cp ./gpt_interface/* ../gpt_interf_serv/ && cd -
|
||||
@@ -0,0 +1,280 @@
|
||||
# latex_commands.py
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import annotations
|
||||
|
||||
import io
|
||||
import logging
|
||||
from typing import Optional
|
||||
|
||||
import discord
|
||||
from discord import app_commands
|
||||
from discord.ext import commands
|
||||
|
||||
from constants import (
|
||||
ALLOWED_ROLES,
|
||||
GUILD_ID,
|
||||
LATEX_MAX_ATTACH_MB,
|
||||
LATEX_MAX_COMPILE_SECONDS,
|
||||
LATEX_MAX_ZIP_MB,
|
||||
LATEX_TEX_ENGINE,
|
||||
OPENAI_MODEL,
|
||||
)
|
||||
from latex_functions import (
|
||||
compile_single_tex_bytes,
|
||||
compile_zip_to_zip,
|
||||
is_safe_asset_name,
|
||||
is_safe_tex_name,
|
||||
)
|
||||
|
||||
|
||||
async def _collect_attachments_bytes(attachments, max_mb: int):
|
||||
"""
|
||||
Zwraca słownik {filename: bytes} dla wszystkich załączników, do limitu MB.
|
||||
Nie podbija wyjątków z .read() — zostawiamy to wyżej; tu zwracamy, co się udało.
|
||||
"""
|
||||
out = {}
|
||||
for a in attachments or []:
|
||||
# limit rozmiaru
|
||||
if (getattr(a, "size", 0) or 0) > max_mb * 1024 * 1024:
|
||||
continue
|
||||
data = await a.read()
|
||||
out[a.filename] = data
|
||||
return out
|
||||
|
||||
|
||||
class LatexModule(commands.Cog):
|
||||
def __init__(self, bot: commands.Bot, logger_name: str):
|
||||
self.bot = bot
|
||||
self.logger = logging.getLogger(logger_name)
|
||||
self.logger_name = logger_name
|
||||
|
||||
# -------- /tex (PDF + diagnoza; log -> debug logger) --------
|
||||
@commands.hybrid_command(
|
||||
nsfw=False,
|
||||
name="tex",
|
||||
description="Kompiluje załączone .tex; PDF-y odsyła. Błędy: diagnoza z OpenAI.",
|
||||
guild=None if GUILD_ID is None else discord.Object(id=GUILD_ID),
|
||||
)
|
||||
@commands.has_any_role(*ALLOWED_ROLES)
|
||||
async def tex(
|
||||
self, ctx: commands.Context, include_source_excerpt: Optional[bool] = True
|
||||
):
|
||||
self.logger.info("LaTeX command invoked by %s", ctx.author)
|
||||
ch = ctx.message.channel
|
||||
# ZBIERZ WSZYSTKIE ZAŁĄCZNIKI
|
||||
async with ch.typing():
|
||||
all_bytes = await _collect_attachments_bytes(
|
||||
ctx.message.attachments, LATEX_MAX_ATTACH_MB
|
||||
)
|
||||
if not all_bytes:
|
||||
return await ctx.reply(
|
||||
f"Dołącz .tex (≤{LATEX_MAX_ATTACH_MB} MiB).", mention_author=False
|
||||
)
|
||||
|
||||
# PODZIEL NA GŁÓWNE .TEX i WSPIERAJĄCE
|
||||
tex_names = [
|
||||
n
|
||||
for n in all_bytes.keys()
|
||||
if n.lower().endswith(".tex") and is_safe_tex_name(n)
|
||||
]
|
||||
if not tex_names:
|
||||
return await ctx.reply(
|
||||
f"Dołącz .tex (≤{LATEX_MAX_ATTACH_MB} MiB).", mention_author=False
|
||||
)
|
||||
|
||||
support_names = [
|
||||
n
|
||||
for n in all_bytes.keys()
|
||||
if n not in tex_names and is_safe_asset_name(n)
|
||||
]
|
||||
|
||||
files_to_send = []
|
||||
parts = []
|
||||
|
||||
for tex_name in tex_names:
|
||||
try:
|
||||
main_bytes = all_bytes[tex_name]
|
||||
support = [
|
||||
(n, all_bytes[n])
|
||||
for n in support_names
|
||||
if n != tex_name and is_safe_asset_name(n)
|
||||
]
|
||||
# (ważne) do supportów dopuszczamy również **inne .tex** – dla \input/\include
|
||||
other_tex = [
|
||||
(n, all_bytes[n])
|
||||
for n in tex_names
|
||||
if n != tex_name and is_safe_tex_name(n)
|
||||
]
|
||||
support.extend(other_tex)
|
||||
|
||||
res = await compile_single_tex_bytes(
|
||||
main_bytes,
|
||||
tex_name,
|
||||
LATEX_TEX_ENGINE,
|
||||
LATEX_MAX_COMPILE_SECONDS,
|
||||
logger="discord",
|
||||
support_files=support,
|
||||
)
|
||||
|
||||
# Twoja dotychczasowa obsługa success/fail – przykładowo:
|
||||
if res["ok"] and res["pdf_bytes"]:
|
||||
b = io.BytesIO(res["pdf_bytes"])
|
||||
b.seek(0)
|
||||
b.name = res["pdf_name"]
|
||||
files_to_send.append(discord.File(b, filename=res["pdf_name"]))
|
||||
parts.append(f"✅ `{tex_name}` → `{res['pdf_name']}`")
|
||||
else:
|
||||
parts.append(
|
||||
f"❌ `{tex_name}` — błąd kompilacji.)"
|
||||
)
|
||||
# Tutaj wywołujesz swoją ścieżkę do OpenAI diagnozy, którą ogarnęliśmy wcześniej.
|
||||
except Exception:
|
||||
# let it crash — pełny stack w logu i re-raise (Discord.py to pokaże sensownie)
|
||||
logging.getLogger("discord").exception(
|
||||
"Unhandled exception while compiling %s", tex_name
|
||||
)
|
||||
raise
|
||||
|
||||
content = (
|
||||
f"**LaTeX** — {len(tex_names)} plik(ów). Model: `{OPENAI_MODEL}`\n\n"
|
||||
+ "\n\n".join(parts)
|
||||
)
|
||||
await ctx.reply(
|
||||
content if len(content) < 1900 else content[:1900] + "…",
|
||||
files=files_to_send,
|
||||
mention_author=False,
|
||||
)
|
||||
|
||||
# -------- /latexclean (PDF only; log -> debug logger) --------
|
||||
@commands.hybrid_command(
|
||||
nsfw=False,
|
||||
name="latexclean",
|
||||
description="Kompiluje .tex i odsyła TYLKO PDF (log w debug).",
|
||||
guild=None if GUILD_ID is None else discord.Object(id=GUILD_ID),
|
||||
)
|
||||
@commands.has_any_role(*ALLOWED_ROLES)
|
||||
async def latexclean(self, ctx: commands.Context):
|
||||
ch = ctx.message.channel
|
||||
async with ch.typing():
|
||||
all_bytes = await _collect_attachments_bytes(
|
||||
ctx.message.attachments, LATEX_MAX_ATTACH_MB
|
||||
)
|
||||
if not all_bytes:
|
||||
return await ctx.reply(
|
||||
f"Dołącz .tex (≤{LATEX_MAX_ATTACH_MB} MiB).", mention_author=False
|
||||
)
|
||||
|
||||
# PODZIEL NA GŁÓWNE .TEX i WSPIERAJĄCE
|
||||
tex_names = [
|
||||
n
|
||||
for n in all_bytes.keys()
|
||||
if n.lower().endswith(".tex") and is_safe_tex_name(n)
|
||||
]
|
||||
if not tex_names:
|
||||
return await ctx.reply(
|
||||
f"Dołącz .tex (≤{LATEX_MAX_ATTACH_MB} MiB).", mention_author=False
|
||||
)
|
||||
|
||||
support_names = [
|
||||
n
|
||||
for n in all_bytes.keys()
|
||||
if n not in tex_names and is_safe_asset_name(n)
|
||||
]
|
||||
|
||||
files_to_send = []
|
||||
parts = []
|
||||
|
||||
for tex_name in tex_names:
|
||||
try:
|
||||
main_bytes = all_bytes[tex_name]
|
||||
support = [
|
||||
(n, all_bytes[n])
|
||||
for n in support_names
|
||||
if n != tex_name and is_safe_asset_name(n)
|
||||
]
|
||||
# (ważne) do supportów dopuszczamy również **inne .tex** – dla \input/\include
|
||||
other_tex = [
|
||||
(n, all_bytes[n])
|
||||
for n in tex_names
|
||||
if n != tex_name and is_safe_tex_name(n)
|
||||
]
|
||||
support.extend(other_tex)
|
||||
|
||||
res = await compile_single_tex_bytes(
|
||||
main_bytes,
|
||||
tex_name,
|
||||
LATEX_TEX_ENGINE,
|
||||
LATEX_MAX_COMPILE_SECONDS,
|
||||
logger="discord",
|
||||
support_files=support,
|
||||
)
|
||||
|
||||
# Twoja dotychczasowa obsługa success/fail – przykładowo:
|
||||
if res["ok"] and res["pdf_bytes"]:
|
||||
b = io.BytesIO(res["pdf_bytes"])
|
||||
b.seek(0)
|
||||
b.name = res["pdf_name"]
|
||||
files_to_send.append(discord.File(b, filename=res["pdf_name"]))
|
||||
parts.append(f"✅ `{tex_name}` → `{res['pdf_name']}`")
|
||||
else:
|
||||
parts.append(
|
||||
f"❌ `{tex_name}` — błąd kompilacji.)"
|
||||
)
|
||||
# Tutaj wywołujesz swoją ścieżkę do OpenAI diagnozy, którą ogarnęliśmy wcześniej.
|
||||
except Exception:
|
||||
# let it crash — pełny stack w logu i re-raise (Discord.py to pokaże sensownie)
|
||||
logging.getLogger("discord").exception(
|
||||
"Unhandled exception while compiling %s", tex_name
|
||||
)
|
||||
raise
|
||||
await ctx.reply(
|
||||
"**LaTeX clean** — " + ", ".join(parts),
|
||||
files=files_to_send,
|
||||
mention_author=False,
|
||||
)
|
||||
|
||||
# -------- /texbatch (ZIP -> ZIP) --------
|
||||
@app_commands.command(
|
||||
name="texbatch",
|
||||
description="Wyślij ZIP z .tex → odeślę ZIP z PDF-ami (tylko udane).",
|
||||
)
|
||||
@app_commands.describe(archive=f"Archiwum .zip (max ~{LATEX_MAX_ZIP_MB} MiB)")
|
||||
@app_commands.checks.has_any_role(*ALLOWED_ROLES)
|
||||
async def texbatch(
|
||||
self, interaction: discord.Interaction, archive: discord.Attachment
|
||||
):
|
||||
await interaction.response.defer()
|
||||
if not archive or not archive.filename.lower().endswith(".zip"):
|
||||
return await interaction.followup.send(
|
||||
"Dołącz ZIP (.zip) z plikami .tex.", ephemeral=True
|
||||
)
|
||||
if archive.size > LATEX_MAX_ZIP_MB * 1024 * 1024:
|
||||
return await interaction.followup.send(
|
||||
f"ZIP > {LATEX_MAX_ZIP_MB} MiB — za duży.", ephemeral=True
|
||||
)
|
||||
|
||||
data = await archive.read()
|
||||
out_zip_bytes, failed = await compile_zip_to_zip(
|
||||
data, LATEX_TEX_ENGINE, LATEX_MAX_COMPILE_SECONDS, logger=self.logger_name
|
||||
)
|
||||
if not out_zip_bytes and failed:
|
||||
return await interaction.followup.send(
|
||||
"Brak PDF-ów. " + "; ".join(failed[:10]), ephemeral=True
|
||||
)
|
||||
|
||||
bio = io.BytesIO(out_zip_bytes)
|
||||
bio.seek(0)
|
||||
bio.name = "compiled_pdfs.zip"
|
||||
if failed:
|
||||
self.logger.debug("BATCH failed: %s", ", ".join(failed))
|
||||
await interaction.followup.send(
|
||||
"✅ Gotowe (ZIP w załączniku)."
|
||||
+ (f" ❌ Błędy: {len(failed)}" if failed else ""),
|
||||
files=[discord.File(bio, filename=bio.name)],
|
||||
)
|
||||
|
||||
|
||||
async def setup(bot):
|
||||
logger = logging.getLogger("discord")
|
||||
await bot.add_cog(LatexModule(bot, logger_name="discord"))
|
||||
logger.info("Loading kinky latex module done")
|
||||
@@ -0,0 +1,179 @@
|
||||
import asyncio
|
||||
import logging
|
||||
import re
|
||||
import shutil
|
||||
import tempfile
|
||||
import zipfile
|
||||
from pathlib import Path
|
||||
from typing import Dict, Iterable, List, Optional, Tuple
|
||||
|
||||
# ===== Bezpieczeństwo nazw/rozszerzeń =====
|
||||
SAFE_TEX_NAME = re.compile(r"^[\w\-. ]+\.tex$", re.IGNORECASE)
|
||||
SAFE_ASSET_NAME = re.compile(
|
||||
r"^[\w\-. /]+?\.(tex|png|jpg|jpeg|pdf|svg|eps|bmp|gif|sty|cls|bib|bst|bbx|cbx|def|cfg)$",
|
||||
re.IGNORECASE,
|
||||
)
|
||||
|
||||
def is_safe_tex_name(name: str) -> bool:
|
||||
return bool(SAFE_TEX_NAME.match(name or ""))
|
||||
|
||||
def is_safe_asset_name(name: str) -> bool:
|
||||
return bool(SAFE_ASSET_NAME.match(name or ""))
|
||||
|
||||
# ===== Uruchamianie kompilatora =====
|
||||
|
||||
async def _run(cmd: List[str], cwd: Path, timeout_sec: int, logger_name: Optional[str]) -> Tuple[int, str]:
|
||||
"""Uruchamia proces kompilatora w cwd, zwraca (rc, sklejone_stdout_stderr)."""
|
||||
logger = logging.getLogger(logger_name) if logger_name else logging.getLogger()
|
||||
logger.debug("RUN %s (cwd=%s, timeout=%s)", " ".join(cmd), cwd, timeout_sec)
|
||||
|
||||
proc = await asyncio.create_subprocess_exec(
|
||||
*cmd,
|
||||
stdout=asyncio.subprocess.PIPE,
|
||||
stderr=asyncio.subprocess.STDOUT,
|
||||
cwd=str(cwd),
|
||||
)
|
||||
try:
|
||||
out = await asyncio.wait_for(proc.communicate(), timeout=timeout_sec)
|
||||
except asyncio.TimeoutError:
|
||||
try:
|
||||
proc.kill()
|
||||
finally:
|
||||
pass
|
||||
return 124, "TIMEOUT: compiler took too long"
|
||||
rc = proc.returncode
|
||||
log = (out[0] or b"").decode("utf-8", errors="ignore")
|
||||
logger.debug("RC=%s, LOG TAIL:\n%s", rc, log[-1500:])
|
||||
return rc, log
|
||||
|
||||
def _build_cmd(tex_engine: str, main_tex: str) -> List[str]:
|
||||
"""Buduje komendę kompilatora; domyślnie tectonic/pdflatex/xelatex."""
|
||||
if tex_engine.lower() == "tectonic":
|
||||
# Tectonic sam robi wielofazowość, ale i tak uruchamiamy 2x (bezpiecznie dla bib/refs)
|
||||
return ["tectonic", "--keep-intermediates", "--synctex", main_tex]
|
||||
elif tex_engine.lower() in ("pdflatex", "xelatex", "lualatex"):
|
||||
return [tex_engine, "-interaction=nonstopmode", "-halt-on-error", main_tex]
|
||||
else:
|
||||
# fallback – traktujemy jak pdflatex
|
||||
return ["pdflatex", "-interaction=nonstopmode", "-halt-on-error", main_tex]
|
||||
|
||||
async def run_latex_two_passes(
|
||||
tex_filename: str, workdir: Path, tex_engine: str, timeout_sec: int, logger: Optional[str] = None
|
||||
) -> Tuple[bool, str, Path]:
|
||||
"""
|
||||
Uruchamia kompilację 2 razy (bezpieczeństwo referencji/bib).
|
||||
Zwraca: (ok, log_text, pdf_path).
|
||||
"""
|
||||
logger_obj = logging.getLogger(logger) if logger else logging.getLogger()
|
||||
logger_obj.info("Compiling %s with %s engine two passes", tex_filename, tex_engine)
|
||||
logs: List[str] = []
|
||||
pdf_path = workdir / (Path(tex_filename).stem + ".pdf")
|
||||
|
||||
# PASS 1
|
||||
rc1, log1 = await _run(_build_cmd(tex_engine, tex_filename), workdir, timeout_sec, logger)
|
||||
logs.append(log1)
|
||||
if rc1 != 0:
|
||||
return False, "".join(logs), pdf_path
|
||||
|
||||
# PASS 2 (często już nic nie robi, ale nie szkodzi)
|
||||
rc2, log2 = await _run(_build_cmd(tex_engine, tex_filename), workdir, timeout_sec, logger)
|
||||
logs.append(log2)
|
||||
ok = (rc2 == 0) and pdf_path.exists()
|
||||
return ok, "".join(logs), pdf_path
|
||||
|
||||
# ===== Kompilacje: pojedynczy TEX + ZIP =====
|
||||
|
||||
async def compile_single_tex_bytes(
|
||||
tex_bytes: bytes,
|
||||
filename: str,
|
||||
tex_engine: str,
|
||||
timeout_sec: int,
|
||||
logger: Optional[str] = None,
|
||||
support_files: Optional[Iterable[Tuple[str, bytes]]] = None,
|
||||
) -> Dict[str, Optional[object]]:
|
||||
"""
|
||||
Kompiluje pojedynczy .tex + dowolne pliki pomocnicze (obrazy, sty/cls/bib, inne .tex).
|
||||
Każdy plik zapisujemy w katalogu roboczym widocznym dla kompilatora.
|
||||
"""
|
||||
log = logging.getLogger(logger) if logger else logging.getLogger()
|
||||
log.info("Compiling %s with %s engine single tex", filename, tex_engine)
|
||||
if not is_safe_tex_name(filename):
|
||||
return {"ok": False, "pdf_bytes": None, "log_text": "Invalid .tex filename", "pdf_name": None}
|
||||
|
||||
with tempfile.TemporaryDirectory(prefix="latex_one_") as td:
|
||||
wd = Path(td)
|
||||
(wd / Path(filename).name).write_bytes(tex_bytes)
|
||||
|
||||
# Zapisz wszystkie supporty obok głównego pliku
|
||||
if support_files:
|
||||
for fname, data in support_files:
|
||||
if not fname or not is_safe_asset_name(fname):
|
||||
continue
|
||||
# spłaszczamy do nazwy bazowej (bez podkatalogów z zewn. źródeł)
|
||||
(wd / Path(fname).name).write_bytes(data)
|
||||
|
||||
ok, log_text, pdf_path = await run_latex_two_passes(Path(filename).name, wd, tex_engine, timeout_sec, logger)
|
||||
log.info("LaTeX compile finished: %s", "OK" if ok else "FAIL")
|
||||
log.info("Log text:\n%s", log_text[-2000:]) # Log last 2000 chars
|
||||
log.info("PDF path: %s", pdf_path)
|
||||
if ok and pdf_path.exists():
|
||||
return {
|
||||
"ok": True,
|
||||
"pdf_bytes": pdf_path.read_bytes(),
|
||||
"log_text": log_text,
|
||||
"pdf_name": pdf_path.name,
|
||||
}
|
||||
return {"ok": False, "pdf_bytes": None, "log_text": log_text, "pdf_name": pdf_path.name}
|
||||
|
||||
async def compile_zip_to_zip(
|
||||
zip_bytes: bytes, tex_engine: str, timeout_sec: int, logger: Optional[str] = None
|
||||
) -> Tuple[bytes, List[str]]:
|
||||
"""
|
||||
Rozpakowuje ZIP, znajduję wszystkie .tex i dla KAŻDEGO tworzy osobny katalog roboczy
|
||||
ze skopiowanym CAŁYM drzewem, by zachować ścieżki względne obrazków/plików.
|
||||
Zwraca (zip_pdf_bytes, lista_rel_sciezek_które_padły).
|
||||
"""
|
||||
log = logging.getLogger(logger) if logger else logging.getLogger()
|
||||
failed: List[str] = []
|
||||
out_pdf_paths: List[Path] = []
|
||||
|
||||
with tempfile.TemporaryDirectory(prefix="latex_zip_") as td:
|
||||
td_path = Path(td)
|
||||
src_root = td_path / "src"
|
||||
src_root.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
# 1) Rozpakuj
|
||||
zpath = td_path / "in.zip"
|
||||
zpath.write_bytes(zip_bytes)
|
||||
with zipfile.ZipFile(zpath, "r") as zf:
|
||||
zf.extractall(src_root)
|
||||
|
||||
# 2) Zbierz .tex
|
||||
tex_files = [p for p in src_root.rglob("*.tex") if is_safe_tex_name(p.name)]
|
||||
if not tex_files:
|
||||
return b"", ["No .tex files found in archive."]
|
||||
|
||||
# 3) Kompiluj każdy .tex w izolacji (kopiujemy całe drzewo do osobnego workdiru)
|
||||
for tex_path in tex_files:
|
||||
rel_tex = tex_path.relative_to(src_root).as_posix()
|
||||
work = td_path / f"build_{tex_path.stem}"
|
||||
try:
|
||||
shutil.copytree(src_root, work / "src")
|
||||
ok, log_text, pdf = await run_latex_two_passes(rel_tex, work / "src", tex_engine, timeout_sec, logger)
|
||||
if ok and pdf.exists():
|
||||
out_pdf_paths.append(pdf)
|
||||
else:
|
||||
failed.append(rel_tex)
|
||||
log.info("LaTeX FAIL %s\n%s", rel_tex, (log_text or "")[-2000:])
|
||||
except Exception:
|
||||
# let it crash – log + re-raise (to zobaczy wyższa warstwa/discord.py)
|
||||
log.exception("Exception while compiling %s", rel_tex)
|
||||
raise
|
||||
|
||||
# 4) Spakuj wyjściowe PDF-y
|
||||
out_zip = td_path / "compiled_pdfs.zip"
|
||||
with zipfile.ZipFile(out_zip, "w", compression=zipfile.ZIP_DEFLATED) as zf:
|
||||
for pdf in out_pdf_paths:
|
||||
zf.write(pdf, arcname=pdf.name)
|
||||
|
||||
return out_zip.read_bytes(), failed
|
||||
+30
-15
@@ -8,6 +8,7 @@ from queue import Empty
|
||||
|
||||
import discord
|
||||
import pdf2image
|
||||
import fitz
|
||||
import PyPDF2
|
||||
import requests
|
||||
from discord.ext import commands, tasks
|
||||
@@ -53,20 +54,34 @@ class DataModule(commands.Cog):
|
||||
filename = res[random.randrange(0, len(res) - 1)]
|
||||
# select random page
|
||||
file = open(DIR_PATH_SADOX + filename, "rb")
|
||||
readpdf = PyPDF2.PdfReader(file)
|
||||
totalpages = len(readpdf.pages)
|
||||
# trunk-ignore(bandit/B311)
|
||||
page = random.randrange(1, totalpages)
|
||||
# convert page to image
|
||||
image = pdf2image.convert_from_path(
|
||||
DIR_PATH_SADOX + filename, first_page=page, last_page=page
|
||||
)
|
||||
byte_io_stream = io.BytesIO()
|
||||
image[0].save(byte_io_stream, "JPEG")
|
||||
byte_io_stream.seek(0)
|
||||
byte_io_stream.name = "image.jpg"
|
||||
file = discord.File(byte_io_stream)
|
||||
await ctx.send(file=file)
|
||||
if True:
|
||||
doc = fitz.open(DIR_PATH_SADOX + filename)
|
||||
totalpages = len(doc)
|
||||
# trunk-ignore(bandit/B311)
|
||||
page_index = random.randrange(0, totalpages)
|
||||
page = doc.load_page(page_index)
|
||||
mat = fitz.Matrix(2.0, 2.0) # powiększenie
|
||||
pix = page.get_pixmap(matrix=mat, alpha=False)
|
||||
|
||||
byte_io_stream = io.BytesIO(pix.tobytes("png"))
|
||||
byte_io_stream.seek(0)
|
||||
byte_io_stream.name = "image.png"
|
||||
await ctx.send(file=discord.File(byte_io_stream))
|
||||
else: #legacy
|
||||
readpdf = PyPDF2.PdfReader(file)
|
||||
totalpages = len(readpdf.pages)
|
||||
# trunk-ignore(bandit/B311)
|
||||
page = random.randrange(1, totalpages)
|
||||
# convert page to image
|
||||
image = pdf2image.convert_from_path(
|
||||
DIR_PATH_SADOX + filename, first_page=page, last_page=page
|
||||
)
|
||||
byte_io_stream = io.BytesIO()
|
||||
image[0].save(byte_io_stream, "JPEG")
|
||||
byte_io_stream.seek(0)
|
||||
byte_io_stream.name = "image.jpg"
|
||||
file = discord.File(byte_io_stream)
|
||||
await ctx.send(file=file)
|
||||
self.logger.info("Get sadox completed")
|
||||
|
||||
@tasks.loop(seconds=3)
|
||||
@@ -222,7 +237,7 @@ class DataModule(commands.Cog):
|
||||
global MESSAGE_TABLE # pylint: disable=global-statement
|
||||
|
||||
result, MESSAGE_TABLE = await handle_response(
|
||||
prompt, vykidailo, bartender, MESSAGE_TABLE, username, "CONVERSATION"
|
||||
prompt, vykidailo, bartender, MESSAGE_TABLE, username, "GENERAL"
|
||||
)
|
||||
if len(result) < 1500:
|
||||
await ctx.send(result)
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
# pdf_render.py
|
||||
import io
|
||||
|
||||
try:
|
||||
import fitz # PyMuPDF
|
||||
_HAS_PYMUPDF = True
|
||||
except Exception:
|
||||
_HAS_PYMUPDF = False
|
||||
from pdf2image import convert_from_path
|
||||
|
||||
def pdf_page_to_image_bytes(path: str, page_index: int = 0, zoom: float = 2.0, fmt: str = "PNG") -> bytes:
|
||||
"""
|
||||
Zwraca bytes obrazka z jednej strony PDF:
|
||||
- PyMuPDF (szybki) jeśli dostępny,
|
||||
- inaczej pdf2image + poppler (wymaga 'pdftoppm').
|
||||
page_index: 0-based
|
||||
"""
|
||||
if _HAS_PYMUPDF:
|
||||
doc = fitz.open(path)
|
||||
page = doc.load_page(page_index)
|
||||
mat = fitz.Matrix(zoom, zoom)
|
||||
pix = page.get_pixmap(matrix=mat, alpha=False)
|
||||
return pix.tobytes(fmt.lower())
|
||||
# fallback
|
||||
images = convert_from_path(path, first_page=page_index+1, last_page=page_index+1, fmt=fmt)
|
||||
bio = io.BytesIO()
|
||||
images[0].save(bio, fmt)
|
||||
return bio.getvalue()
|
||||
@@ -13,6 +13,7 @@ spotipy
|
||||
tiktoken
|
||||
PyNaCl
|
||||
flask[async]
|
||||
PyMuPDF
|
||||
waitress
|
||||
clickupython
|
||||
assemblyai[extras]
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
name,type,locations,ap_head,ap_body,ap_larm,ap_rarm,ap_lleg,ap_rleg,max_ag,traits,weight,availability,source,notes
|
||||
Flak Vest,armor,"Body",0,4,0,0,0,0,,Flak,7,Common,"DH2 CRB","PRZYKŁAD – ZASTĄP"
|
||||
Power Armour (Astartes),armor,"All",8,10,8,8,9,9,,Environmental; Auto-senses,100,"Very Rare","DW CRB","PRZYKŁAD – ZASTĄP"
|
||||
|
@@ -0,0 +1,60 @@
|
||||
// DH2 Attack Test v2 — presets: Aim/Range/Fire + Size/Light/Cover
|
||||
const actor = canvas.tokens.controlled[0]?.actor ?? game.user.character;
|
||||
if (!actor) return ui.notifications.warn("Zaznacz token albo przypisz postać.");
|
||||
new Dialog({
|
||||
title: "🎯 Attack Test (WS/BS)",
|
||||
content: `
|
||||
<form>
|
||||
<div class="form-group"><label>Base Target (WS/BS)</label><input name="base" type="number" value="40"/></div>
|
||||
<div class="form-group"><label>Aim</label>
|
||||
<select name="aim"><option value="0">None</option><option value="10">Half (+10)</option><option value="20">Full (+20)</option></select></div>
|
||||
<div class="form-group"><label>Range</label>
|
||||
<select name="range">
|
||||
<option value="0">Standard</option>
|
||||
<option value="30">Point Blank (+30)</option>
|
||||
<option value="10">Short (+10)</option>
|
||||
<option value="-10">Long (-10)</option>
|
||||
<option value="-30">Extreme (-30)</option>
|
||||
</select></div>
|
||||
<div class="form-group"><label>Fire / Attack</label>
|
||||
<select name="stance">
|
||||
<option value="0">Standard / Single</option>
|
||||
<option value="10">Semi (+10)</option>
|
||||
<option value="-10">Full Auto (-10)</option>
|
||||
<option value="30">All Out (Melee +30)</option>
|
||||
</select></div>
|
||||
<div class="form-group"><label>Target Size</label>
|
||||
<select name="size">
|
||||
<option value="0">Average</option>
|
||||
<option value="10">Hulking (+10)</option>
|
||||
<option value="20">Enormous (+20)</option>
|
||||
<option value="30">Massive (+30)</option>
|
||||
<option value="-10">Puny (-10)</option>
|
||||
</select></div>
|
||||
<div class="form-group"><label>Lighting</label>
|
||||
<select name="light"><option value="0">Normal</option><option value="10">Good (+10)</option><option value="-10">Poor (-10)</option></select></div>
|
||||
<div class="form-group"><label>Cover</label>
|
||||
<select name="cover"><option value="0">None</option><option value="-10">Light (-10)</option><option value="-20">Heavy (-20)</option></select></div>
|
||||
<div class="form-group"><label>Other Modifiers</label><input name="mod" type="number" value="0"/></div>
|
||||
</form>`,
|
||||
buttons: {
|
||||
roll: {
|
||||
label: "Roll",
|
||||
callback: async (html) => {
|
||||
const get = n => Number(html.find(`[name="${n}"]`).val());
|
||||
const base = get("base");
|
||||
const total = base + get("aim") + get("range") + get("stance") + get("size") + get("light") + get("cover") + get("mod");
|
||||
const r = await(new Roll("1d100")).roll({async:true});
|
||||
const ok = r.total <= total;
|
||||
const margin = Math.abs(total - r.total);
|
||||
const dox = ok ? 1 + Math.floor(margin/10) : Math.floor(margin/10);
|
||||
const table = `
|
||||
<table style="width:100%;border-collapse:collapse">
|
||||
<tr><td><b>Target</b></td><td>${total}</td><td><b>Roll</b></td><td>${r.total}</td></tr>
|
||||
<tr><td><b>Result</b></td><td colspan="3">${ok?'<span style="color:green">SUCCESS</span>':'<span style="color:red">FAIL</span>'} — ${ok?dox+' DoS':dox+' DoF'}</td></tr>
|
||||
</table>`;
|
||||
r.toMessage({speaker: ChatMessage.getSpeaker({actor}), flavor: `🎯 <b>Attack Test</b><br/>${table}`});
|
||||
}
|
||||
}
|
||||
}
|
||||
}).render(true);
|
||||
@@ -0,0 +1,6 @@
|
||||
Roll,Result
|
||||
1,Energy/Head — wpis 1
|
||||
2,Energy/Head — wpis 2
|
||||
3,Energy/Head — wpis 3
|
||||
4,Energy/Head — wpis 4
|
||||
5,Energy/Head — wpis 5
|
||||
|
@@ -0,0 +1,50 @@
|
||||
// 🧠 Focus Power (DH2) — WP test + Phenomena/Perils with mode presets
|
||||
const actor = canvas.tokens.controlled[0]?.actor ?? game.user.character;
|
||||
if (!actor) return ui.notifications.warn("Zaznacz token.");
|
||||
new Dialog({
|
||||
title: "🧠 Focus Power",
|
||||
content: `
|
||||
<form>
|
||||
<div class="form-group"><label>Willpower (target)</label><input name="wp" type="number" value="40"/></div>
|
||||
<div class="form-group"><label>Psychic Rating (PR)</label><input name="pr" type="number" value="3"/></div>
|
||||
<div class="form-group"><label>Mode</label>
|
||||
<select name="mode"><option value="fettered">Fettered (no PP; PR/2)</option><option value="unfettered" selected>Unfettered (PP on doubles)</option><option value="push">Push (always PP; +PR)</option></select></div>
|
||||
<div class="form-group"><label>Power difficulty/gear/etc. (flat mod)</label><input name="flat" type="number" value="0"/></div>
|
||||
<div class="form-group"><label>Perils threshold</label><input name="thr" type="number" value="75"/></div>
|
||||
</form>`,
|
||||
buttons: {
|
||||
roll: { label: "Roll", callback: async html => {
|
||||
const wp = Number(html.find('[name="wp"]').val());
|
||||
const pr = Number(html.find('[name="pr"]').val());
|
||||
const mode = html.find('[name="mode"]').val();
|
||||
const flat = Number(html.find('[name="flat"]').val());
|
||||
const thr = Number(html.find('[name="thr"]').val());
|
||||
let effPR = pr, ppmod = 0, ppAlways = false, note = "";
|
||||
if (mode==="fettered"){ effPR = Math.max(1, Math.floor(pr/2)); note="(Fettered: PR/2, brak Phenomena)"; }
|
||||
if (mode==="push"){ effPR = pr+3; ppmod=10; ppAlways = true; note="(Push: +3 PR, Phenomena zawsze, +10)"; }
|
||||
const target = wp + flat;
|
||||
const roll = await (new Roll("1d100")).roll({async:true});
|
||||
const ok = roll.total <= target;
|
||||
const dos = ok ? 1 + Math.floor((target - roll.total)/10) : Math.floor((roll.total - target)/10);
|
||||
const doubles = (roll.total%11===0) || (roll.total===100);
|
||||
const info = `<table style="width:100%;border-collapse:collapse">
|
||||
<tr><td><b>Target</b></td><td>${target}</td><td><b>Roll</b></td><td>${roll.total}</td></tr>
|
||||
<tr><td><b>Result</b></td><td colspan="3">${ok?'<span style="color:green">SUCCESS</span>':'<span style="color:red">FAIL</span>'} — ${ok?dos+' DoS':dos+' DoF'} ${doubles?' — <b>DOUBLES</b>':''}</td></tr>
|
||||
<tr><td><b>Eff. PR</b></td><td>${effPR}</td><td><b>Range hint</b></td><td>${effPR*10} m (jeśli moc tak działa)</td></tr>
|
||||
</table>`;
|
||||
roll.toMessage({speaker: ChatMessage.getSpeaker({actor}), flavor:`🧠 <b>Focus Power</b> ${note}<br/>${info}`});
|
||||
const needPP = (mode==="unfettered" && doubles) || (mode==="push") ;
|
||||
if (needPP){
|
||||
const tbl = game.tables.getName("Psychic Phenomena");
|
||||
if (tbl){
|
||||
const r = await (new Roll(`1d100 + ${ppmod}`)).roll({async:true});
|
||||
await tbl.draw({displayResults:true, roll:r});
|
||||
if (r.total >= thr){
|
||||
const per = game.tables.getName("Perils of the Warp");
|
||||
if (per) await per.draw({displayResults:true});
|
||||
}
|
||||
} else ChatMessage.create({content:"Utwórz RollTable: <b>Psychic Phenomena</b> (+ <b>Perils of the Warp</b>)"});
|
||||
}
|
||||
}}
|
||||
}
|
||||
}).render(true);
|
||||
@@ -0,0 +1,22 @@
|
||||
// 🎯 Hit Location (DH mapping by reversed roll)
|
||||
new Dialog({
|
||||
title:"🎯 Hit Location",
|
||||
content:`<form>
|
||||
<div class="form-group"><label>Attack d100 roll</label><input name="roll" type="number" value="37"/></div>
|
||||
</form>`,
|
||||
buttons:{
|
||||
go:{label:"Resolve", callback: html=>{
|
||||
const n = Math.max(1, Math.min(100, Number(html.find('[name="roll"]').val())));
|
||||
const rev = Number(String(n).padStart(2,"0").split("").reverse().join(""));
|
||||
let loc = "";
|
||||
if (rev<=10) loc="Head";
|
||||
else if (rev<=20) loc="Right Arm";
|
||||
else if (rev<=30) loc="Left Arm";
|
||||
else if (rev<=70) loc="Body";
|
||||
else if (rev<=85) loc="Right Leg";
|
||||
else loc="Left Leg";
|
||||
ChatMessage.create({content:`🎯 <b>Hit Location</b>: roll ${n} → reversed ${rev} → <b>${loc}</b>`});
|
||||
}}
|
||||
}
|
||||
}).render(true);
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
const text=`<b>House Rules — DH2 chassis</b><br/>
|
||||
• Unnatural mapowanie: dawne ×2 bonus → Unnatural (+X) tak, by SB/TB odzwierciedlały linię źródłową.<br/>
|
||||
• Pancerz Astartes: zachowaj AP; zużycie zasilania jako +1 Fatigue co X scen zamiast liczenia minut.<br/>
|
||||
• Aptitudes: archetypy z RT/DW/BC mają przypisane 2–3 Aptitudes DH2 dla kosztów XP.<br/>
|
||||
• Psy: testy i PR z DH2 dla wszystkich; GK posiada Aegis Discipline (1×/scena reroll Perils) + 1–2 signature powers z DW.<br/>
|
||||
• RT Acquisition → DH2 Influence z modyfikatorami kontekstowymi (teatr działań, mandat Inkwizycji, czas).`;ChatMessage.create({content:text});
|
||||
@@ -0,0 +1,11 @@
|
||||
// 🚦 Initiative for selected tokens (1d10 + AG Bonus prompt)
|
||||
if (!canvas.tokens.controlled.length) return ui.notifications.warn("Zaznacz co najmniej jeden token.");
|
||||
const combat = game.combat ?? await Combat.implementation.create({});
|
||||
for (const t of canvas.tokens.controlled){
|
||||
if (!combat.combatants.some(c=>c.tokenId===t.id)) await combat.createEmbeddedDocuments("Combatant",[ {tokenId:t.id, sceneId: canvas.scene.id, hidden:false} ]);
|
||||
const ag = Number(await Dialog.prompt({title:`AG Bonus for ${t.name}`, content:`<input type="number" value="4">`, label:"OK"}));
|
||||
const r = await (new Roll(`1d10 + ${ag}`)).roll({async:true});
|
||||
await combat.setInitiative(combat.combatants.find(c=>c.tokenId===t.id).id, r.total);
|
||||
r.toMessage({flavor:`🚦 <b>Initiative</b> — ${t.name}: ${r.total}`});
|
||||
}
|
||||
ui.notifications.info("Inicjatywy ustawione.");
|
||||
@@ -0,0 +1,21 @@
|
||||
Roll,Result
|
||||
1-5,Perils 1–5 — WPISZ
|
||||
6-10,Perils 6–10 — WPISZ
|
||||
11-15,Perils 11–15 — WPISZ
|
||||
16-20,Perils 16–20 — WPISZ
|
||||
21-25,Perils 21–25 — WPISZ
|
||||
26-30,Perils 26–30 — WPISZ
|
||||
31-35,Perils 31–35 — WPISZ
|
||||
36-40,Perils 36–40 — WPISZ
|
||||
41-45,Perils 41–45 — WPISZ
|
||||
46-50,Perils 46–50 — WPISZ
|
||||
51-55,Perils 51–55 — WPISZ
|
||||
56-60,Perils 56–60 — WPISZ
|
||||
61-65,Perils 61–65 — WPISZ
|
||||
66-70,Perils 66–70 — WPISZ
|
||||
71-75,Perils 71–75 — WPISZ
|
||||
76-80,Perils 76–80 — WPISZ
|
||||
81-85,Perils 81–85 — WPISZ
|
||||
86-90,Perils 86–90 — WPISZ
|
||||
91-95,Perils 91–95 — WPISZ
|
||||
96-100,Perils 96–100 — WPISZ
|
||||
|
@@ -0,0 +1,3 @@
|
||||
name,type,discipline,action,test,range,sustained,effect,source,notes
|
||||
Smite,power,Biomancy,Half,"WP Challenging (+0)","PR*10m",No,"1d10+PR E; Tearing","DH2 CRB","PRZYKŁAD – ZASTĄP"
|
||||
Foreboding,power,Divination,Reaction,"Per Difficult (-10)","Self",No,"Use as Evasion; DoS rules","DH2 CRB","PRZYKŁAD – ZASTĄP"
|
||||
|
+21
@@ -0,0 +1,21 @@
|
||||
Roll,Result
|
||||
1-5,PP 1–5 — WPISZ
|
||||
6-10,PP 6–10 — WPISZ
|
||||
11-15,PP 11–15 — WPISZ
|
||||
16-20,PP 16–20 — WPISZ
|
||||
21-25,PP 21–25 — WPISZ
|
||||
26-30,PP 26–30 — WPISZ
|
||||
31-35,PP 31–35 — WPISZ
|
||||
36-40,PP 36–40 — WPISZ
|
||||
41-45,PP 41–45 — WPISZ
|
||||
46-50,PP 46–50 — WPISZ
|
||||
51-55,PP 51–55 — WPISZ
|
||||
56-60,PP 56–60 — WPISZ
|
||||
61-65,PP 61–65 — WPISZ
|
||||
66-70,PP 66–70 — WPISZ
|
||||
71-75,PP 71–75 — WPISZ
|
||||
76-80,PP 76–80 — WPISZ
|
||||
81-85,PP 81–85 — WPISZ
|
||||
86-90,PP 86–90 — WPISZ
|
||||
91-95,PP 91–95 — WPISZ
|
||||
96-100,PP 96–100 — WPISZ
|
||||
|
@@ -0,0 +1,28 @@
|
||||
// 🩹 Toggle conditions on selected tokens (Foundry v13)
|
||||
const choices = [
|
||||
{id:"fatigued", label:"Fatigued"},
|
||||
{id:"stunned", label:"Stunned"},
|
||||
{id:"prone", label:"Prone"},
|
||||
{id:"frightened", label:"Frightened (Fear)"}
|
||||
];
|
||||
const opts = choices.map(c=>`<label><input type="checkbox" name="c" value="${c.id}"> ${c.label}</label>`).join("<br/>");
|
||||
new Dialog({
|
||||
title:"🩹 Conditions",
|
||||
content:`<form>${opts}<div class="form-group"><label>Mode</label>
|
||||
<select name="mode"><option value="toggle">Toggle</option><option value="on">Apply</option><option value="off">Remove</option></select></div></form>`,
|
||||
buttons:{
|
||||
go:{label:"Apply",callback: html=>{
|
||||
const ids = Array.from(html.find('input[name="c"]:checked')).map(e=>e.value);
|
||||
const mode = html.find('[name="mode"]').val();
|
||||
const getEf = id => CONFIG.statusEffects.find(e=>e.id===id) ?? {id};
|
||||
canvas.tokens.controlled.forEach(t=>{
|
||||
ids.forEach(id=>{
|
||||
if (mode==="toggle") t.toggleEffect(getEf(id));
|
||||
else if (mode==="on") t.actor?.effects?.some(e=>e.getFlag("core","statusId")===id) ? null : t.toggleEffect(getEf(id));
|
||||
else if (mode==="off") t.actor?.effects?.some(e=>e.getFlag("core","statusId")===id) ? t.toggleEffect(getEf(id)) : null;
|
||||
});
|
||||
});
|
||||
}}
|
||||
}
|
||||
}).render(true);
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
// 💥 Quick Damage — supports Tearing, Proven(X), Primitive(X), flat mod
|
||||
new Dialog({
|
||||
title:"💥 Damage Roller",
|
||||
content: `
|
||||
<form>
|
||||
<div class="form-group"><label>Flat modifier (e.g., +3)</label><input name="mod" type="number" value="0"/></div>
|
||||
<div class="form-group"><label>Traits</label>
|
||||
<label><input type="checkbox" name="tear"> Tearing</label>
|
||||
<label><input type="checkbox" name="prov"> Proven</label>
|
||||
<input name="provV" type="number" value="0" style="width:60px" placeholder="X"/>
|
||||
<label><input type="checkbox" name="prim"> Primitive</label>
|
||||
<input name="primV" type="number" value="0" style="width:60px" placeholder="X"/>
|
||||
</div>
|
||||
</form>`,
|
||||
buttons:{
|
||||
go:{label:"Roll", callback: async html=>{
|
||||
const mod = Number(html.find('[name="mod"]').val());
|
||||
const tearing = html.find('[name="tear"]')[0].checked;
|
||||
const proven = html.find('[name="prov"]')[0].checked ? Number(html.find('[name="provV"]').val()) : 0;
|
||||
const primitive = html.find('[name="prim"]')[0].checked ? Number(html.find('[name="primV"]').val()) : 0;
|
||||
// base die (d10) with tearing (best of 2)
|
||||
const r1 = await (new Roll("1d10")).roll({async:true});
|
||||
const r2 = tearing ? await (new Roll("1d10")).roll({async:true}) : null;
|
||||
let die = tearing ? Math.max(r1.total, r2.total) : r1.total;
|
||||
// apply Proven/Primitive
|
||||
if (proven>0) die = Math.max(die, proven);
|
||||
if (primitive>0) die = Math.min(die, primitive);
|
||||
const rf = (die===10); // potential Zealous Hatred trigger
|
||||
const total = die + mod;
|
||||
let flavor = `💥 <b>Damage</b><br/>Die: ${die}${tearing?` (Tearing ${r1.total}/${r2.total.total})`:''} + Mod ${mod} = <b>${total}</b>`;
|
||||
if (proven>0) flavor += `<br/>Proven(${proven}) zastosowano`;
|
||||
if (primitive>0) flavor += `<br/>Primitive(${primitive}) zastosowano`;
|
||||
if (rf) flavor += `<br/><b>⚡ Natural 10</b> — rozważ Zealous Hatred.`;
|
||||
ChatMessage.create({speaker: ChatMessage.getSpeaker(), content: flavor});
|
||||
}}
|
||||
}
|
||||
}).render(true);
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
// 📚 Create placeholder RollTables for Crits + Psychic Phenomena/Perils (with icons)
|
||||
const icon = {Energy:"⚡", Impact:"🔨", Rending:"🗡️", Explosive:"💥"};
|
||||
const dmgTypes = ["Energy","Impact","Rending","Explosive"];
|
||||
const locs = ["Head","Body","Left Arm","Right Arm","Left Leg","Right Leg"];
|
||||
async function makeCrit(dtype, loc){
|
||||
const name = `Crit: ${dtype} - ${loc}`;
|
||||
if (game.tables.getName(name)) return;
|
||||
const results = [];
|
||||
for (let i=1;i<=5;i++){
|
||||
results.push({type:0, text:`${icon[dtype]||""} ${dtype}/${loc} — wpis ${i} (uzupełnij z PDF)`, weight:1, range:[i,i]});
|
||||
}
|
||||
await RollTable.implementation.create({name, formula:"1d5", replacement:true, displayRoll:false, results});
|
||||
}
|
||||
async function makeWide(name, emoji){
|
||||
if (game.tables.getName(name)) return;
|
||||
const results = [];
|
||||
for (let i=0;i<20;i++){
|
||||
const lo=i*5+1, hi=i*5+5;
|
||||
results.push({type:0, text:`${emoji} ${name} ${lo}-${hi} — wpis (uzupełnij z PDF)`, weight:1, range:[lo,hi]});
|
||||
}
|
||||
await RollTable.implementation.create({name, formula:"1d100", replacement:true, displayRoll:false, results});
|
||||
}
|
||||
for (const d of dmgTypes) for (const l of locs) await makeCrit(d,l);
|
||||
await makeWide("Psychic Phenomena","🌀");
|
||||
await makeWide("Perils of the Warp","☠️");
|
||||
ui.notifications.info("Utworzono puste tabele: Crits (4×6) + Phenomena + Perils.");
|
||||
@@ -0,0 +1,3 @@
|
||||
name,type,tier,aptitudes,prereq,effect,source,notes
|
||||
Ambidextrous,talent,1,"Agility; Offence","Ag 30","-10 to off-hand penalty","DH2 CRB","PRZYKŁAD – ZASTĄP"
|
||||
Aegis Discipline (GK),talent,2,"Willpower; Defence","Psyker","Reroll Perils 1×scene","HOUSE","DODAJ WŁASNY OPIS"
|
||||
|
@@ -0,0 +1,3 @@
|
||||
name,type,subtype,damage,pen,range,rof,qualities,weight,availability,source,notes
|
||||
Lasgun M36,weapon,Basic,"1d10+3",0,100m,"S/3/–","Reliable",4,Common,"DH2 CRB p.142","PRZYKŁAD – ZASTĄP"
|
||||
Astartes Bolter,weapon,Basic,"1d10+9",4,90m,"S/2/–","Tearing; Unreliable",9,Rare,"DW CRB","PRZYKŁAD – ZASTĄP"
|
||||
|
@@ -0,0 +1,33 @@
|
||||
// ⚡ Zealous Hatred helper (DH2) — roll 1d5 crit OR add +1d5 dmg
|
||||
new Dialog({
|
||||
title: "⚡ Zealous Hatred",
|
||||
content: `
|
||||
<form>
|
||||
<div class="form-group"><label>Wound damage after Armour/TB?</label>
|
||||
<select name="penetrated"><option value="yes">Yes → roll Critical (1d5)</option><option value="no">No → add +1d5 damage</option></select></div>
|
||||
<div class="form-group"><label>Damage Type</label>
|
||||
<select name="dtype"><option>Energy</option><option>Impact</option><option>Rending</option><option>Explosive</option></select></div>
|
||||
<div class="form-group"><label>Hit Location</label>
|
||||
<select name="loc"><option>Head</option><option>Body</option><option>Left Arm</option><option>Right Arm</option><option>Left Leg</option><option>Right Leg</option></select></div>
|
||||
<div class="form-group"><label>Table name (optional override)</label><input name="tname" type="text" placeholder="Crit: Energy - Head"/></div>
|
||||
</form>`,
|
||||
buttons: {
|
||||
go: { label: "Resolve", callback: async html => {
|
||||
const pen = html.find('[name="penetrated"]').val();
|
||||
if (pen === "yes") {
|
||||
const dtype = html.find('[name="dtype"]').val();
|
||||
const loc = html.find('[name="loc"]').val();
|
||||
const override = html.find('[name="tname"]').val()?.trim();
|
||||
const name = override || `Crit: ${dtype} - ${loc}`;
|
||||
const r = await (new Roll("1d5")).roll({async:true});
|
||||
const table = game.tables.getName(name);
|
||||
if (table) await table.draw({displayResults:true, roll:r});
|
||||
else r.toMessage({flavor:`⚡ <b>Zealous Hatred</b>: Critical ${r.total} — brak tabeli <b>${name}</b> (utwórz lub zmień nazwę).`});
|
||||
} else {
|
||||
const r = await (new Roll("1d5")).roll({async:true});
|
||||
r.toMessage({flavor:"⚡ <b>Zealous Hatred</b>: Dodaj do obrażeń <b>+1d5</b> (atak nie przebił Soak)."});
|
||||
}
|
||||
}}
|
||||
}
|
||||
}).render(true);
|
||||
|
||||
@@ -22,20 +22,6 @@
|
||||
false,
|
||||
false
|
||||
],
|
||||
"indie\\b": [
|
||||
"Indie? *Wyciąga rewolwerową wyrzutnię taktycznych bomb jądrowych* Gdzie??? *Zaczyna się maniakalnie śmiać*",
|
||||
15.0,
|
||||
0,
|
||||
false,
|
||||
false
|
||||
],
|
||||
"hindus": [
|
||||
"Hindus? Gdzie.... *Wyciąga spod lady ciężki miotacz płomieni i zaczyna się maniakalnie śmiać*",
|
||||
15.0,
|
||||
0,
|
||||
false,
|
||||
false
|
||||
],
|
||||
"chuj\\b": [
|
||||
"Eeeee.... Szefie... ktoś cię woła! Wskazuje na Hammera",
|
||||
15.0,
|
||||
@@ -99,27 +85,6 @@
|
||||
false,
|
||||
false
|
||||
],
|
||||
"tatarek\\b": [
|
||||
"Tatarek? Nie dramatyzuj....",
|
||||
15.0,
|
||||
0,
|
||||
false,
|
||||
false
|
||||
],
|
||||
"krowa\\b": [
|
||||
"Krówka? Nie dramatyzuj....",
|
||||
15.0,
|
||||
0,
|
||||
false,
|
||||
false
|
||||
],
|
||||
"krówka\\b": [
|
||||
"Krówka? Nie dramatyzuj....",
|
||||
15.0,
|
||||
0,
|
||||
false,
|
||||
false
|
||||
],
|
||||
"jessenia\\b": [
|
||||
"Jessenia? Jak przyszła tu w różowej pidżamie z uszkami to nawet nie mrugnąłem okiem. Te oczy.... No ale jakiś debil Ją prowokował mówiąc \"Zdominuj mnie\" Akurat miała dobry humor więc przeżył - ale po 115.0 sekundach był już na \"Tak Pani, przepraszam że zająłem czas Pani\" Respect dla kobitki",
|
||||
15.0,
|
||||
@@ -190,20 +155,6 @@
|
||||
false,
|
||||
false
|
||||
],
|
||||
"elokwentna\\b": [
|
||||
"O matko. Znowu ta dyskusja? Hammer ma stary słownik gdzie elokwentna i pyskata są praktycznie synonimami. Jedyna różnica że swojej uległej można za bycie pyskatym dać po dupie.",
|
||||
15.0,
|
||||
0,
|
||||
false,
|
||||
false
|
||||
],
|
||||
"elokwencja\\b": [
|
||||
"O matko. Znowu ta dyskusja? Hammer ma stary słownik gdzie elokwentna i pyskata są praktycznie synonimami. Jedyna różnica że swojej uległej można za bycie pyskatym dać po dupie.",
|
||||
15.0,
|
||||
0,
|
||||
false,
|
||||
false
|
||||
],
|
||||
"same plusy\\b": [
|
||||
"Jak na cmentarzu Szefie. Jak na cmentarzu",
|
||||
15.0,
|
||||
@@ -253,13 +204,6 @@
|
||||
false,
|
||||
false
|
||||
],
|
||||
"fallain\\b": [
|
||||
"Kochana Krówka. Skłonność do dramatów i zakrwawiania ścian. Jedna z kilku NAPRAWDE srogich masochistek... Ach ta krew :drool:",
|
||||
15.0,
|
||||
0,
|
||||
false,
|
||||
false
|
||||
],
|
||||
"roar": [
|
||||
"Kici, kici....",
|
||||
15.0,
|
||||
@@ -316,13 +260,6 @@
|
||||
false,
|
||||
true
|
||||
],
|
||||
"revalyacyjnie\\b": [
|
||||
"Zajebisty dowcip szefie. Na pewno się \"Twojej Byłej Dziewczynie\":tm: spodoba.",
|
||||
15.0,
|
||||
0,
|
||||
false,
|
||||
true
|
||||
],
|
||||
"nocna zmiana\\b": [
|
||||
"Nocna Zmiana? No to właściciele tego baru. Taki troche Hammer Harema. Kto to jest Harem>? Łokurwa. Harem Hammera. Ale on tu robi za jedyną hurysę, a reszta to szejkowie. Tak zrobię Ci szejka.",
|
||||
15.0,
|
||||
|
||||
@@ -69,6 +69,7 @@ async def on_ready():
|
||||
await client.load_extension("other_commands")
|
||||
await client.load_extension("voice_recognition_commands")
|
||||
await client.load_extension("file_search_commands")
|
||||
await client.load_extension("latex_commands")
|
||||
logger.info("Sensors: online")
|
||||
|
||||
logger.info(client.cogs)
|
||||
|
||||
Reference in New Issue
Block a user