Skip to content

Commit 6471fb8

Browse files
created a consistent usage of the image with the tokens and the bearer
1 parent b59a1ee commit 6471fb8

File tree

2 files changed

+9
-25
lines changed

2 files changed

+9
-25
lines changed

cogs/imagine_cog.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ async def regenerate(
115115
return
116116

117117
image_file = discord.File(image, filename="image.png")
118-
if dic["nsfw"]:
119-
image_file.filename = f"SPOILER_{image_file.filename}"
120118
time_taken_delta: datetime.timedelta = datetime.datetime.now() - start
121119

122120
embed: SafeEmbed = await generate_pollinate_embed(
@@ -386,7 +384,12 @@ async def imagine_command(
386384
)
387385
try:
388386
dic, image = await generate_image(
389-
prompt, width, height, model, safe, cached, nologo, enhance, private
387+
prompt=prompt,
388+
width=width,
389+
height=height,
390+
model=model,
391+
safe=safe,
392+
enhance=enhance,
390393
)
391394
time_taken = (datetime.datetime.now() - start).total_seconds()
392395
discord_logger.log_image_generation(

utils/image_gen_utils.py

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ async def generate_image(
4242
height: int = config.image_generation.defaults.height,
4343
model: str = None, # Don't use config.MODELS[0] as default
4444
safe: bool = config.image_generation.defaults.safe,
45-
cached: bool = config.image_generation.defaults.cached,
46-
nologo: bool = config.image_generation.defaults.nologo,
4745
enhance: bool = config.image_generation.defaults.enhance,
48-
private: bool = config.image_generation.defaults.private,
4946
seed: int = random.randint(0, 2**31 - 1),
5047
**kwargs,
5148
):
@@ -56,21 +53,18 @@ async def generate_image(
5653
model = config.image_generation.fallback_model
5754

5855
validate_model(model)
59-
url: str = f"https://gen.pollinations.ai/image/{quote(prompt)}?seed={seed}&width={width}&height={height}&model={model}&safe={str(safe).lower()}&nologo={str(nologo).lower()}&enhance={str(enhance).lower()}&nofeed={str(private).lower()}&referer={quote(config.image_generation.referer)}"
56+
url: str = f"https://gen.pollinations.ai/image/{quote(prompt)}?seed={seed}&width={width}&height={height}&model={model}&safe={str(safe).lower()}&enhance={str(enhance).lower()}"
57+
6058
dic = {
6159
"prompt": prompt,
6260
"width": width,
6361
"height": height,
6462
"model": model,
6563
"safe": safe,
66-
"cached": cached,
67-
"nologo": nologo,
68-
"enhance": enhance,
6964
"url": url,
65+
"seed": seed,
7066
}
7167

72-
dic["seed"] = None if cached else seed
73-
7468
headers = {
7569
"Authorization": f"Bearer {os.getenv('ENTER_TOKEN')}",
7670
}
@@ -109,19 +103,6 @@ async def generate_image(
109103

110104
try:
111105
dic["nsfw"] = user_comment["has_nsfw_concept"]
112-
if (
113-
enhance
114-
or len(prompt)
115-
< config.image_generation.validation.max_enhanced_prompt_length
116-
):
117-
enhance_prompt = user_comment["prompt"]
118-
if enhance_prompt == prompt:
119-
dic["enhanced_prompt"] = None
120-
else:
121-
enhance_prompt = enhance_prompt[
122-
: enhance_prompt.rfind("\n")
123-
].strip()
124-
dic["enhanced_prompt"] = enhance_prompt
125106
except Exception:
126107
dic["nsfw"] = False
127108

0 commit comments

Comments
 (0)