Upload 4 files

man.py

@@ -2176,8 +2176,8 @@ class Man :
             if local_attrs[attr] in ( 'random','none'):
                 local_attrs[attr] = random.choice(man_description[attr][1:])
         
-        pt=f'A {local_attrs["character"]} Man with {local_attrs["eye_color"]} Eyes ,{local_attrs["hair_style"]} And {local_attrs["hair_color"]} Hair and a preference for {local_attrs["upper_attire"]} and {local_attrs["lower_attire"]} Dress,{local_attrs["skin"]} Skin, {local_attrs["physique"]} Body .{local_attrs["action"]}'
-        return pt+"\n"+hashTagsaMan(pt)
+        pt=f'A {local_attrs["character"]} Man with {local_attrs["eye_color"]} Eyes ,{local_attrs["hair_style"]} And {local_attrs["hair_color"]} Hair and {local_attrs["skin"]} Skin, {local_attrs["physique"]} Body .And a preference for {local_attrs["upper_attire"]} Dress,and  {local_attrs["action"][:-1]} .'
+        return pt+"\n"+hashTagsaMan(pt )
     def shortStr(self):
         attrs = man_description.keys()
         #print(man_description.items())
@@ -2219,13 +2219,16 @@ def _randomActionMan(pt:str):
     upper_attire=random.choice (man_description["upper_attire"][1:])
     s=action[:-1] + "and with "+ upper_attire + " and "  " Dress ."
     pts=pt.split(".")
-    if len (pts)>2:pts[-2]=s
+    if len (pts)>2:pts[-1]=s
     else:pts.insert(1,s )
-    return ".".join (pts)
+    ls=hashTagsPlace1(action) 
+    return ".".join (pts)+" #".join(ls)
     
     
 
 
+
+
 def randomActionMan(w):
     if not isinstance(w,Man):return _randomActionMan(w)
     w.action=randomPlace().shortStr()
@@ -2325,15 +2328,13 @@ def testMan():
     print(w2)
     print (w1.toJson())
     print (w2.toJson())
-    sw1=str(w1).replace(".",",")+"."
+    sw1=str(w1)
     w3=ManFromString(sw1)
     print(sw1)
     print(w3)
-    print(randomActionMan(sw1))
     print(randomActionMan(w3))
 
-    print(hashTagsaMan(str(w2)))
-    print(randManWoman())
+
 
 if __name__=="__main__":
     testMan()

pets.py

@@ -311,7 +311,7 @@ class Animal:
                 local_attrs[attr] = random.choice(pet_description[attr][1:])
         
         #pt=f'A {local_attrs["name"]} with {local_attrs["eyes"]} Eyes And {local_attrs["skin"]} Skin and  {local_attrs["physique"]} Body.   {local_attrs["place"]}..'
-        pt=f'A {local_attrs["name"]} Animal with {local_attrs["eyes"]} Eyes and  {local_attrs["physique"]} Body.  And it is {local_attrs["action"]}.'
+        pt=f'A {local_attrs["name"]} Animal with {local_attrs["eyes"]} Eyes.  And it is {local_attrs["action"]}.'
         return pt+"\n"+hashTagsaAnimal(pt)
     def shortStr(self):
         attrs = pet_description.keys()
@@ -322,7 +322,7 @@ class Animal:
             if local_attrs[attr] in( 'random','none'):
                 local_attrs[attr] = random.choice(man_description[attr][1:])
         
-        pt=f'A {local_attrs["name"]} Animal with {local_attrs["eyes"]} Eyes and  {local_attrs["physique"]} Body. '
+        pt=f'A {local_attrs["name"]} Animal with {local_attrs["eyes"]} Eyes.  '
         return pt
 
     def toJson(self):
@@ -385,7 +385,7 @@ def hashTagsaAnimal(w):
     if not isinstance(w,Animal):w=AnimalFromString(w)
     body=("".join ([x.capitalize() for x in w.physique.split()[-2:] ])+"Body").replace ("-","")
     name=("".join ([x.capitalize() for x in w.name.split()[-2:] ])).replace ("-","")
-    ls=[body ,name ]
+    ls=[name ]
     for x in ls:
         if x.strip() in HashTagsDict:
             ls.append(HashTagsDict[x.strip()]) 
@@ -396,7 +396,7 @@ def hashTagsaAnimal1(w):
     body=("".join ([x.capitalize() for x in w.physique.split()[-2:] ])+"Body").replace ("-","")
     name=("".join ([x.capitalize() for x in w.name.split()[-2:] ])).replace ("-","")   
     
-    return [body , name ]
+    return [ name ]
                   
 def animalPromptUI(*args):
     w=animalPrompt(*args)

places.py

@@ -26,7 +26,7 @@ class Place:
             if local_attrs[attr] in( 'random','none'):
                 local_attrs[attr] = random.choice(place_description[attr][1:])
         
-        pt=f'{local_attrs["place"]}  in {local_attrs["name"]} with  {local_attrs["physique"]} View. '
+        pt=f'{local_attrs["place"]}  ,{local_attrs["name"]} ,  {local_attrs["physique"]} View. '
         return pt+"\n"+hashTagsPlace(pt)
     def shortStr(self):
         attrs = place_description.keys()
@@ -36,7 +36,7 @@ class Place:
         for attr in attrs:
             if local_attrs[attr] in( 'random','none'):
                 local_attrs[attr] = random.choice(place_description[attr][1:])
-        pt=f'{local_attrs["place"]}  in {local_attrs["name"]} with  {local_attrs["physique"]} View.{local_attrs["action"]}.'
+        pt=f'{local_attrs["action"]}, {local_attrs["place"]} at {local_attrs["name"]} with {local_attrs["physique"]} View  .'
         return pt
 
     def toJson(self):
@@ -95,7 +95,8 @@ def hashTagsPlace(w):
     if not isinstance(w,Place):w=PlaceFromString(w)
     body=("".join ([x.capitalize() for x in w.physique.split()[-2:] ])+"View").replace ("-","")
     name=("".join ([x.capitalize() for x in w.name.split()[-2:] ])).replace ("-","")
-    ls=[name,body ]
+    pose=("".join ([x.strip().capitalize() for x in w.action.split()[-3:] ])).replace ("-","")
+    ls=[name,body ,pose]
     for x in ls:
         if x.strip() in HashTagsDict:
             ls.append(HashTagsDict[x.strip()])
@@ -104,9 +105,10 @@ def hashTagsPlace(w):
 def hashTagsPlace1(w):
     if not isinstance(w,Place):w=PlaceFromString(w)
     body=("".join ([x.capitalize() for x in w.physique.split()[-2:] ])+"View").replace ("-","")
-    name=("".join ([x.capitalize() for x in w.name.split()[-2:] ])).replace ("-","")   
+    name=("".join ([x.capitalize() for x in w.name.split()[-2:] ])).replace ("-","")
+    pose=("".join ([x.capitalize() for x in w.action.split()[-3:] ])).replace ("-","")  
     
-    return [name ,body]
+    return [name ,body,pose]
                   
 def placePromptUI(*args):
     w=placePrompt(*args)

women1.py

@@ -11908,7 +11908,7 @@ class Woman:
         for attr in attrs:
             if local_attrs[attr] == 'random':
                 local_attrs[attr] = random.choice(woman_description[attr])
-        pt0=f'A {local_attrs["character"]} Woman with {local_attrs["eye_color"]},{local_attrs["hair_style"]} And {local_attrs["hair_color"]} Hair and a preference for {local_attrs["dress_upper"]} and {local_attrs["dress_styles"]} Dress,{local_attrs["skin"]} Skin, {local_attrs["body"]} Body,{local_attrs["breast_size"]} Breasts , {local_attrs["hip_measurements"]} Hips .Additional,{local_attrs["additional"]} , {local_attrs["action"]}'
+        pt0=f'A {local_attrs["character"]} Woman with {local_attrs["eye_color"]},{local_attrs["hair_style"]} And {local_attrs["hair_color"]} Hair and a preference for {local_attrs["dress_upper"]} and {local_attrs["dress_styles"]} Dress,{local_attrs["skin"]} Skin, {local_attrs["body"]} Body,{local_attrs["breast_size"]} Breasts . Additional,{local_attrs["additional"]} , {local_attrs["action"]}'
         
         for k,v in local_attrs.items():
             if v in Translator:
@@ -11947,8 +11947,8 @@ class Woman:
             if local_attrs[attr] in ( 'random','none'):
                 local_attrs[attr] = random.choice(woman_description[attr][1:])
         
-        pt=f'A {local_attrs["character"]} Woman with {local_attrs["eye_color"]} Eyes ,{local_attrs["hair_style"]} And {local_attrs["hair_color"]} Hair and a preference for {local_attrs["dress_upper"]} and {local_attrs["dress_styles"]} Dress,{local_attrs["skin"]} Skin, {local_attrs["body"]} Body,{local_attrs["breast_size"]} Breasts , {local_attrs["hip_measurements"]} Hips .Additional,{local_attrs["additional"]} , {local_attrs["action"]}'
-        return pt+"\n"+hashTags(pt)
+        pt=f'A {local_attrs["character"]} Woman with {local_attrs["eye_color"]} Eyes and {local_attrs["hair_style"]} And {local_attrs["hair_color"]} Hair and {local_attrs["skin"]} Skin and {local_attrs["body"]} Body,{local_attrs["breast_size"]} Breasts .And a preference for {local_attrs["dress_upper"]} Dress,  and  {local_attrs["action"][:-1]} .'
+        return pt+"\n"+hashTags(pt )
 
     def shortStr(self):
         attrs = [
@@ -11992,18 +11992,36 @@ def womanPromptUI(*args):
     return str(w)
 
 
-def _randomAction(pt:str):
+def _randomAction(pt:str,name="random"):
+    pts=pt.split(".")
+    if len (pts)>1:name=PlaceFromString(pts[1]).name
     action=randomPlace().shortStr()
+    
     #random.choice (woman_description['action'][1:])
     dress_styles=random.choice (woman_description["dress_styles"][1:])
     dress_upper=random.choice (woman_description["dress_upper"][1:])
-    s=action[:-1] + "and with "+ dress_upper + " and " + " Dress "
+    s=action[:-1] + "and with "+ dress_upper + " Dress "
+    
+    if len (pts)>1:pts.insert(1,s)
+    else:pts.apend(action)
+    ls=hashTagsPlace1(action) 
+    return ".".join (pts) +" #".join(ls)
+    
+
+def randomActionKeepName(pt:str,name="random"):
     pts=pt.split(".")
-    if len (pts)>2:pts[-2]=s
-    else:pts.insert(1,s )
-    return ".".join (pts)
+    if len (pts)>1:name=PlaceFromString(pts[1]).name
+    action=randomPlace(name=name ).shortStr() 
+    #random.choice (woman_description['action'][1:])
+    dress_styles=random.choice (woman_description["dress_styles"][1:])
+    dress_upper=random.choice (woman_description["dress_upper"][1:])
+    s=action[:-1] + "and with "+ dress_upper + " Dress "
     
+    if len (pts)>1:pts[1]=action
+    else:pts.apend(action)
+    return ".".join (pts)
     
+            
 
 
 def randomAction(w):
@@ -12186,16 +12204,11 @@ def testWoman():
     print (w1.toJson())
     print (w2.toJson())
     sw1=str(w1).replace(".",",")+"."
-    w3=WomanFromString(sw1)
-    print(sw1)
+    w3=str(WomanFromString(sw1))
     print(w3)
-    print(randomAction(sw1))
     print(randomAction(w3))
-    print (w1.toT())
-    print (w2.toT())
-    print (w1.toS())
-    print (w2.toS())
-    print(hashTags(str(w2)))
+    
+   # print(hashTags(str(w2)))
     
 
 if __name__=="__main__":